This is a note to let you know that I've just added the patch titled
tcp-repair: Handle zero-length data put in rcv queue
to the 3.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tcp-repair-handle-zero-length-data-put-in-rcv-queue.patch
and it can be found in the queue-3.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 595346d0cfb8f16c971429de4d75dad9929c913a Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <[email protected]>
Date: Mon, 29 Oct 2012 05:05:33 +0000
Subject: tcp-repair: Handle zero-length data put in rcv queue
From: Pavel Emelyanov <[email protected]>
[ Upstream commit c454e6111d1ef4268fe98e87087216e51c2718c3 ]
When sending data into a tcp socket in repair state we should check
for the amount of data being 0 explicitly. Otherwise we'll have an skb
with seq == end_seq in rcv queue, but tcp doesn't expect this to happen
(in particular a warn_on in tcp_recvmsg shoots).
Signed-off-by: Pavel Emelyanov <[email protected]>
Reported-by: Giorgos Mavrikas <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/ipv4/tcp_input.c | 3 +++
1 file changed, 3 insertions(+)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4556,6 +4556,9 @@ int tcp_send_rcvq(struct sock *sk, struc
struct tcphdr *th;
bool fragstolen;
+ if (size == 0)
+ return 0;
+
skb = alloc_skb(size + sizeof(*th), sk->sk_allocation);
if (!skb)
goto err;
Patches currently in stable-queue which might be from [email protected] are
queue-3.6/tcp-repair-handle-zero-length-data-put-in-rcv-queue.patch
queue-3.6/net-inet_diag-return-error-code-if-protocol-handler-is-missed.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
