diff options
| author | Alexandra Kossovsky <Alexandra.Kossovsky@oktetlabs.ru> | 2010-03-18 20:29:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-18 20:29:24 -0700 |
| commit | b634f87522dff87712df8bda2a6c9061954d552a (patch) | |
| tree | fad85992b6d2566ba635434339da7567966ce1a6 /net | |
| parent | 22001a13d09d82772e831dcdac0553994a4bac5d (diff) | |
| download | blackbird-op-linux-b634f87522dff87712df8bda2a6c9061954d552a.tar.gz blackbird-op-linux-b634f87522dff87712df8bda2a6c9061954d552a.zip | |
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')
| -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 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 |
