2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Marcelo Ricardo Leitner <[email protected]> [ 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 <[email protected]> Signed-off-by: Marcelo Ricardo Leitner <[email protected]> Acked-by: Vlad Yasevich <[email protected]> Signed-off-by: David S. Miller <[email protected]> [bwh: Backported to 3.2: SK_FLAGS_TIMESTAMP is newly defined] Signed-off-by: Ben Hutchings <[email protected]> (cherry picked from commit d85242d91610acbe4f905624a5758a01ae7bb32c) Signed-off-by: Willy Tarreau <[email protected]> --- include/net/sock.h | 2 ++ net/sctp/socket.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/include/net/sock.h b/include/net/sock.h index 44d6be8..98f2765 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -507,6 +507,8 @@ enum sock_flags { SOCK_TIMESTAMPING_SYS_HARDWARE, /* %SOF_TIMESTAMPING_SYS_HARDWARE */ }; +#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 c26d905..37daea5 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -6756,6 +6756,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(); } /* Populate the fields of the newsk from the oldsk and migrate the assoc -- 1.7.12.2.21.g234cd45.dirty
