From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754654AbcAWOub (ORCPT ); Sat, 23 Jan 2016 09:50:31 -0500 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:27594 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754072AbcAWOrX (ORCPT ); Sat, 23 Jan 2016 09:47:23 -0500 Message-Id: <20160123141223.072416862@1wt.eu> User-Agent: quilt/0.63-1 Date: Sat, 23 Jan 2016 15:12:46 +0100 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Vyukov , Marcelo Ricardo Leitner , Vlad Yasevich , "David S. Miller" , Ben Hutchings , Willy Tarreau Subject: [PATCH 2.6.32 25/42] sctp: update the netstamp_needed counter when copying sockets MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Marcelo Ricardo Leitner [ 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 (cherry picked from commit d85242d91610acbe4f905624a5758a01ae7bb32c) Signed-off-by: Willy Tarreau --- 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