lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[145/156] tcp: Fix OOB POLLIN avoidance.
2.6.33-stable review patch.  If anyone has any objections, please let us know.

------------------
From: Alexandra Kossovsky <Alexandra.Kossovsky@oktetlabs.ru>

[ 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>

---
net/ipv4/tcp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -429,7 +429,7 @@ unsigned int tcp_poll(struct file *file,
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



\
 
 \ /
  Last update: 2010-03-31 01:29    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site