net: Fix oops from tcp_collapse() when using splice()
Subsystems (3)
PATCH 1/1 net: Fix oops from tcp_collapse() when using splice()
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.
---
net/ipv4/tcp.c +1 -0
@@ -1335,6 +1335,7 @@ int tcp_read_sock(struct sock *sk, read_sk_eat_skb (sk, skb,0 );if (!desc->count)break ; + tp->copied_seq = seq; } tp->copied_seq = seq;
David Miller
maintainerFrom: "Steven J. Magnani" <[email protected]>
Date: Tue, 30 Mar 2010 15:45:13 -0500
Quoted 8 lines
tcp_read_sock()can have a eat skbs without immediately advancingcopied_seq. This can cause a panic intcp_collapse()if it is called as a result of therecv_actordropping 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 <[email protected]>
Thanks for fixing this I'll look at your patch more closely right now.
David Miller
maintainerFrom: David Miller <[email protected]>
Date: Tue, 30 Mar 2010 13:47:41 -0700 (PDT)
Quoted 7 lines
From: "Steven J. Magnani" <[email protected]>
Date: Tue, 30 Mar 2010 15:45:13 -0500Quoted 4 lines
tcp_read_sock()can have a eat skbs without immediately advancingcopied_seq. This can cause a panic intcp_collapse()if it is called as a result of therecv_actordropping the socket lock.
Quoted 7 lines
Quoted 4 lines
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 <[email protected]>Thanks for fixing this I'll look at your patch more closely right now.
Patch applied, thanks Steven!