| commit | 12fc5c218002041cf2d3be3a5fd26fad993c6fbc | |
| author | Steven J. Magnani <steve@digidescorp.com> | |
| Tue, 30 Mar 2010 20:56:01 +0000 (30 13:56 -0700) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Mon, 27 Sep 2010 00:21:20 +0000 (26 17:21 -0700) | ||
| tree | 9a975688bd122b5a302852518dd419cdff2c0909 | treesnapshot (tar.gz zip) |
| parent | c9d740b86fee3c2be9eaf3d7728c15c0e03f4d83 | commitdiff |
net: Fix oops from tcp_collapse() when using splice()
[ Upstream commit baff42ab1494528907bf4d5870359e31711746ae ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
[ Upstream commit baff42ab1494528907bf4d5870359e31711746ae ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| net/ipv4/tcp.c | diffblobblamehistory |