aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorTom Marshall <tdm.code@gmail.com>2010-09-20 15:42:05 -0700
committerDavid S. Miller <davem@davemloft.net>2010-09-20 15:42:05 -0700
commita4d258036ed9b2a1811c3670c6099203a0f284a0 (patch)
tree58412022664aef745a99d254d20cf1a66aabda44 /net/ipv4/tcp_input.c
parentrose: Fix signedness issues wrt. digi count. (diff)
downloadlinux-dev-a4d258036ed9b2a1811c3670c6099203a0f284a0.tar.xz
linux-dev-a4d258036ed9b2a1811c3670c6099203a0f284a0.zip
tcp: Fix race in tcp_poll
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>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r--net/ipv4/tcp_input.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index e663b78a2ef6..149e79ac2891 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4048,6 +4048,8 @@ static void tcp_reset(struct sock *sk)
default:
sk->sk_err = ECONNRESET;
}
+ /* This barrier is coupled with smp_rmb() in tcp_poll() */
+ smp_wmb();
if (!sock_flag(sk, SOCK_DEAD))
sk->sk_error_report(sk);