Linux 3.6.7

[thirdparty/kernel/stable-queue.git] / releases / 3.6.7 / tcp-repair-handle-zero-length-data-put-in-rcv-queue.patch

diff --git a/releases/3.6.7/tcp-repair-handle-zero-length-data-put-in-rcv-queue.patch b/releases/3.6.7/tcp-repair-handle-zero-length-data-put-in-rcv-queue.patch
new file mode 100644 (file)
index 0000000..b3d8eca
--- /dev/null
+++ b/releases/3.6.7/tcp-repair-handle-zero-length-data-put-in-rcv-queue.patch
@@ -0,0 +1,35 @@
+From 595346d0cfb8f16c971429de4d75dad9929c913a Mon Sep 17 00:00:00 2001
+From: Pavel Emelyanov <xemul@parallels.com>
+Date: Mon, 29 Oct 2012 05:05:33 +0000
+Subject: tcp-repair: Handle zero-length data put in rcv queue
+
+
+From: Pavel Emelyanov <xemul@parallels.com>
+
+[ 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 <xemul@parallels.com>
+Reported-by: Giorgos Mavrikas <gmavrikas@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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;