]> git.openpandora.org Git - pandora-kernel.git/commitdiff
tcp: Fix race in tcp_poll
authorTom Marshall <tdm.code@gmail.com>
Mon, 20 Sep 2010 22:42:05 +0000 (15:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 Sep 2010 22:42:05 +0000 (15:42 -0700)
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>
net/ipv4/tcp.c
net/ipv4/tcp_input.c

diff --cc net/ipv4/tcp.c
Simple merge
Simple merge