From: Alexandra Kossovsky <Alexandra.Kossovsky@oktetlabs.ru>
Date: Fri, 19 Mar 2010 03:29:24 +0000 (-0700)
Subject: tcp: Fix OOB POLLIN avoidance.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b634f87522dff87712df8bda2a6c9061954d552a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

tcp: Fix OOB POLLIN avoidance.

From: Alexandra.Kossovsky@oktetlabs.ru

Fixes kernel bugzilla #15541

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 5901010fad55..ae16f809e716 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