projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| e1e69077 GKH |
1 | From b17f5da6dd40f9a5a60bce31fd94e0d96194af50 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexandra Kossovsky <Alexandra.Kossovsky@oktetlabs.ru> | |
| 3 | Date: Thu, 18 Mar 2010 20:29:24 -0700 | |
| 4 | Subject: tcp: Fix OOB POLLIN avoidance. | |
| 5 | ||
| 6 | From: Alexandra Kossovsky <Alexandra.Kossovsky@oktetlabs.ru> | |
| 7 | ||
| 8 | [ Upstream commit b634f87522dff87712df8bda2a6c9061954d552a ] | |
| 9 | ||
| 10 | From: Alexandra.Kossovsky@oktetlabs.ru | |
| 11 | ||
| 12 | Fixes kernel bugzilla #15541 | |
| 13 | ||
| 14 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
| 15 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 16 | ||
| 17 | --- | |
| 18 | net/ipv4/tcp.c | 2 +- | |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 20 | ||
| 21 | --- a/net/ipv4/tcp.c | |
| 22 | +++ b/net/ipv4/tcp.c | |
| 23 | @@ -429,7 +429,7 @@ unsigned int tcp_poll(struct file *file, | |
| 24 | if (tp->urg_seq == tp->copied_seq && | |
| 25 | !sock_flag(sk, SOCK_URGINLINE) && | |
| 26 | tp->urg_data) | |
| 27 | - target--; | |
| 28 | + target++; | |
| 29 | ||
| 30 | /* Potential race condition. If read of tp below will | |
| 31 | * escape above sk->sk_state, we can be illegally awaken |