diff options
| author | Alexandra Kossovsky <Alexandra.Kossovsky@oktetlabs.ru> | 2010-03-18 20:29:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-01 16:02:11 -0700 |
| commit | f1783b77374b69b6b91123da581e939caa13b7d1 (patch) | |
| tree | 63dff19e99dcb26f9078c85a99bf30a2c138e665 /net | |
| parent | bc56fb554602a3b87c7e58bb910ddfb1e6b978bb (diff) | |
tcp: Fix OOB POLLIN avoidance.
[ Upstream commit b634f87522dff87712df8bda2a6c9061954d552a ]
From: Alexandra.Kossovsky@oktetlabs.ru
Fixes kernel bugzilla #15541
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 225df28633ca..564a0f87cd66 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -429,7 +429,7 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait) if (tp->urg_seq == tp->copied_seq && !sock_flag(sk, SOCK_URGINLINE) && tp->urg_data) - target--; + target++; /* Potential race condition. If read of tp below will * escape above sk->sk_state, we can be illegally awaken |