From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756995AbcAUAqF (ORCPT ); Wed, 20 Jan 2016 19:46:05 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:51420 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752384AbcAUAok (ORCPT ); Wed, 20 Jan 2016 19:44:40 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marcelo Ricardo Leitner , Vlad Yasevich , "David S. Miller" Subject: [PATCH 4.3 27/55] sctp: also copy sk_tsflags when copying the socket Date: Wed, 20 Jan 2016 16:44:02 -0800 Message-Id: <20160120232228.806018639@linuxfoundation.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <20160120232227.417513468@linuxfoundation.org> References: <20160120232227.417513468@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marcelo Ricardo Leitner [ Upstream commit 50a5ffb1ef535e3c6989711c51b5d61b543a3b45 ] As we are keeping timestamps on when copying the socket, we also have to copy sk_tsflags. This is needed since b9f40e21ef42 ("net-timestamp: move timestamp flags out of sk_flags"). Signed-off-by: Marcelo Ricardo Leitner Acked-by: Vlad Yasevich Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sctp/socket.c | 1 + 1 file changed, 1 insertion(+) --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -7163,6 +7163,7 @@ void sctp_copy_sock(struct sock *newsk, newsk->sk_type = sk->sk_type; newsk->sk_bound_dev_if = sk->sk_bound_dev_if; newsk->sk_flags = sk->sk_flags; + newsk->sk_tsflags = sk->sk_tsflags; newsk->sk_no_check_tx = sk->sk_no_check_tx; newsk->sk_no_check_rx = sk->sk_no_check_rx; newsk->sk_reuse = sk->sk_reuse;