diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2015-12-04 20:14:04 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-12-30 05:26:03 +0300 |
| commit | d85242d91610acbe4f905624a5758a01ae7bb32c (patch) | |
| tree | 42388d6377930882581dc621c27ddf9ee0fd4430 | |
| parent | 8b13ca710909eeb40654ccdba2519a6f663f09ce (diff) | |
| download | linux-d85242d91610acbe4f905624a5758a01ae7bb32c.tar.xz | |
sctp: update the netstamp_needed counter when copying sockets
[ Upstream commit 01ce63c90170283a9855d1db4fe81934dddce648 ]
Dmitry Vyukov reported that SCTP was triggering a WARN on socket destroy
related to disabling sock timestamp.
When SCTP accepts an association or peel one off, it copies sock flags
but forgot to call net_enable_timestamp() if a packet timestamping flag
was copied, leading to extra calls to net_disable_timestamp() whenever
such clones were closed.
The fix is to call net_enable_timestamp() whenever we copy a sock with
that flag on, like tcp does.
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2: SK_FLAGS_TIMESTAMP is newly defined]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | include/net/sock.h | 2 | ||||
| -rw-r--r-- | net/sctp/socket.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index c8dcbb808993..8f7cb22553fe 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -565,6 +565,8 @@ enum sock_flags { SOCK_ZEROCOPY, /* buffers from userspace */ }; +#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE)) + static inline void sock_copy_flags(struct sock *nsk, struct sock *osk) { nsk->sk_flags = osk->sk_flags; diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 27eb73d44e59..396283b306ab 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -6731,6 +6731,9 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk, newinet->mc_ttl = 1; newinet->mc_index = 0; newinet->mc_list = NULL; + + if (newsk->sk_flags & SK_FLAGS_TIMESTAMP) + net_enable_timestamp(); } static inline void sctp_copy_descendant(struct sock *sk_to, |