aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorAlexandra Kossovsky <Alexandra.Kossovsky@oktetlabs.ru>2010-03-18 20:29:24 -0700
committerDavid S. Miller <davem@davemloft.net>2010-03-18 20:29:24 -0700
commitb634f87522dff87712df8bda2a6c9061954d552a (patch)
treefad85992b6d2566ba635434339da7567966ce1a6 /net/ipv4
parent22001a13d09d82772e831dcdac0553994a4bac5d (diff)
downloadkernel_samsung_tuna-b634f87522dff87712df8bda2a6c9061954d552a.zip
kernel_samsung_tuna-b634f87522dff87712df8bda2a6c9061954d552a.tar.gz
kernel_samsung_tuna-b634f87522dff87712df8bda2a6c9061954d552a.tar.bz2
tcp: Fix OOB POLLIN avoidance.
From: Alexandra.Kossovsky@oktetlabs.ru Fixes kernel bugzilla #15541 Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-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 5901010..ae16f80 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