diff options
| author | Tom Marshall <tdm.code@gmail.com> | 2010-09-20 15:42:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-20 15:42:05 -0700 |
| commit | a4d258036ed9b2a1811c3670c6099203a0f284a0 (patch) | |
| tree | 58412022664aef745a99d254d20cf1a66aabda44 /net/ipv4/tcp.c | |
| parent | 9828e6e6e3f19efcb476c567b9999891d051f52f (diff) | |
| download | op-kernel-dev-a4d258036ed9b2a1811c3670c6099203a0f284a0.zip op-kernel-dev-a4d258036ed9b2a1811c3670c6099203a0f284a0.tar.gz | |
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.c')
| -rw-r--r-- | net/ipv4/tcp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 3fb1428..95d75d4 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -386,8 +386,6 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) */ mask = 0; - if (sk->sk_err) - mask = POLLERR; /* * POLLHUP is certainly not done right. But poll() doesn't @@ -457,6 +455,11 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) if (tp->urg_data & TCP_URG_VALID) mask |= POLLPRI; } + /* This barrier is coupled with smp_wmb() in tcp_reset() */ + smp_rmb(); + if (sk->sk_err) + mask |= POLLERR; + return mask; } EXPORT_SYMBOL(tcp_poll); |
