Skip to content

Commit

Permalink
net: Fix oops from tcp_collapse() when using splice()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
smagnani authored and davem330 committed Mar 30, 2010
1 parent c0cd884 commit baff42a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions net/ipv4/tcp.c
Expand Up @@ -1368,6 +1368,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;

Expand Down

0 comments on commit baff42a

Please sign in to comment.