]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
tcp: Fix race in tcp_poll
authorTom Marshall <tdm.code@gmail.com>
Mon, 20 Sep 2010 22:42:05 +0000 (15:42 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 9 Dec 2010 21:24:20 +0000 (13:24 -0800)
commitf55602fe53731957890c6af874c40f5b0c07a387
tree44e526e3ae62e60bb517f0c18b0f6cc02a93bc86
parent8fe45abc8d6f871411f8305d82bb999926629afb
tcp: Fix race in tcp_poll

[ Upstream commit a4d258036ed9b2a1811c3670c6099203a0f284a0 ]

If a RST comes in immediately after checking sk->sk_err, tcp_poll will
return POLLIN but not POLLOUT.  Fix this by checking sk->sk_err at the end
of tcp_poll.  Additionally, ensure the correct order of operations on SMP
machines with memory barriers.

Signed-off-by: Tom Marshall <tdm.code@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/ipv4/tcp.c
net/ipv4/tcp_input.c