diff options
| author | Steven J. Magnani <steve@digidescorp.com> | 2010-03-30 13:56:01 -0700 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2011-04-30 16:53:40 +0200 |
| commit | 36493e838ff016f2cd54353e81e9213d95c5022f (patch) | |
| tree | c5952e1e0f329dd45170de6fc086a3867b9af174 | |
| parent | 2c7e4c4f58501ac1adc9ddcabda04be7849a60ff (diff) | |
net: Fix oops from tcp_collapse() when using splice()
commit baff42ab1494528907bf4d5870359e31711746ae upstream.
tcp_read_sock() can have a eat skbs without immediately advancing copied_seq.
This can cause a panic in tcp_collapse() if it is called as a result
of the recv_actor dropping the socket lock.
A userspace program that splices data from a socket to either another
socket or to a file can trigger this bug.
Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/tcp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 8ae8ea8c1d5d..268426d62530 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1256,6 +1256,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, sk_eat_skb(sk, skb, 0); if (!desc->count) break; + tp->copied_seq = seq; } tp->copied_seq = seq; |