From: Marcelo Ricardo Leitner Date: Fri, 4 Dec 2015 17:14:04 +0000 (-0200) Subject: sctp: update the netstamp_needed counter when copying sockets X-Git-Tag: v3.16.35~856 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=954f566280f49b7b6b2b6a3d44fbb9b7cbf61a0c;p=thirdparty%2Fkernel%2Fstable.git sctp: update the netstamp_needed counter when copying sockets commit 01ce63c90170283a9855d1db4fe81934dddce648 upstream. 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 Signed-off-by: Marcelo Ricardo Leitner Acked-by: Vlad Yasevich Signed-off-by: David S. Miller Signed-off-by: Luis Henriques --- diff --git a/include/net/sock.h b/include/net/sock.h index 9c24377a7bc9b..d4a6b45f337ff 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -702,6 +702,8 @@ enum sock_flags { SOCK_SELECT_ERR_QUEUE, /* Wake select on error queue */ }; +#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/core/sock.c b/net/core/sock.c index 9956e854d0e6e..ac9aa2878d996 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -422,8 +422,6 @@ static void sock_warn_obsolete_bsdism(const char *name) } } -#define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE)) - static void sock_disable_timestamp(struct sock *sk, unsigned long flags) { if (sk->sk_flags & flags) { diff --git a/net/sctp/socket.c b/net/sctp/socket.c index a8fd2f57af97f..e58140abe17e5 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -6999,6 +6999,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,