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.2.75~10 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d85242d91610acbe4f905624a5758a01ae7bb32c 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 Signed-off-by: Marcelo Ricardo Leitner Acked-by: Vlad Yasevich Signed-off-by: David S. Miller [bwh: Backported to 3.2: SK_FLAGS_TIMESTAMP is newly defined] Signed-off-by: Ben Hutchings --- 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,