From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:58180 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751028AbdEKJOL (ORCPT ); Thu, 11 May 2017 05:14:11 -0400 Subject: Patch "tcp: fix access to sk->sk_state in tcp_poll()" has been added to the 4.11-stable tree To: dcaratti@redhat.com, davem@davemloft.net, gregkh@linuxfoundation.org, weiwan@google.com Cc: , From: Date: Thu, 11 May 2017 11:13:56 +0200 Message-ID: <149449403615097@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled tcp: fix access to sk->sk_state in tcp_poll() to the 4.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: tcp-fix-access-to-sk-sk_state-in-tcp_poll.patch and it can be found in the queue-4.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Thu May 11 11:03:14 CEST 2017 From: Davide Caratti Date: Wed, 26 Apr 2017 19:07:35 +0200 Subject: tcp: fix access to sk->sk_state in tcp_poll() From: Davide Caratti [ Upstream commit d68be71ea14d609a5f31534003319be5db422595 ] avoid direct access to sk->sk_state when tcp_poll() is called on a socket using active TCP fastopen with deferred connect. Use local variable 'state', which stores the result of sk_state_load(), like it was done in commit 00fd38d938db ("tcp: ensure proper barriers in lockless contexts"). Fixes: 19f6d3f3c842 ("net/tcp-fastopen: Add new API support") Signed-off-by: Davide Caratti Acked-by: Wei Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -533,7 +533,7 @@ unsigned int tcp_poll(struct file *file, if (tp->urg_data & TCP_URG_VALID) mask |= POLLPRI; - } else if (sk->sk_state == TCP_SYN_SENT && inet_sk(sk)->defer_connect) { + } else if (state == TCP_SYN_SENT && inet_sk(sk)->defer_connect) { /* Active TCP fastopen socket with defer_connect * Return POLLOUT so application can call write() * in order for kernel to generate SYN+data Patches currently in stable-queue which might be from dcaratti@redhat.com are queue-4.11/tcp-fix-access-to-sk-sk_state-in-tcp_poll.patch