aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAlexandra Kossovsky <Alexandra.Kossovsky@oktetlabs.ru>2010-03-18 23:29:24 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-01 19:02:11 -0400
commitf1783b77374b69b6b91123da581e939caa13b7d1 (patch)
tree63dff19e99dcb26f9078c85a99bf30a2c138e665 /net
parentbc56fb554602a3b87c7e58bb910ddfb1e6b978bb (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.c2
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)
429 if (tp->urg_seq == tp->copied_seq && 429 if (tp->urg_seq == tp->copied_seq &&
430 !sock_flag(sk, SOCK_URGINLINE) && 430 !sock_flag(sk, SOCK_URGINLINE) &&
431 tp->urg_data) 431 tp->urg_data)
432 target--; 432 target++;
433 433
434 /* Potential race condition. If read of tp below will 434 /* Potential race condition. If read of tp below will
435 * escape above sk->sk_state, we can be illegally awaken 435 * escape above sk->sk_state, we can be illegally awaken