tcp-repair: Handle zero-length data put in rcv queue

PATCH Applied Pavel Emelyanov 2 participants 3 messages Oct 29, 2012 – Nov 3, 2012

Subsystems (3)

Networking Network drivers TCP

lore

Share & tools

lore

Pavel Emelyanov

author

2012-10-29 15:05 UTC #0 lore raw

PATCH 1/1 tcp-repair: Handle zero-length data put in rcv queue

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]>

---

Quoted 1 line

From 8f70f4ea4f509a3772ee7eb5d9d5c2571a86652a Mon Sep 17 00:00:00 2001

From: Pavel Emelyanov <[email protected]>
Date: Mon, 29 Oct 2012 18:12:41 +0400
Subject: [PATCH] fix for repair queue getback

Signed-off-by Pavel Emelyanov <[email protected]>

---
 net/ipv4/tcp_input.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

net/ipv4/tcp_input.c +3 -0

index 432c366..ff5b746 100644
@@ -4529,6 +4529,9 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size)
 	struct tcphdr *th;
 	bool fragstolen;
 
+	if (size == 0)
+		return 0;
+
 	skb = alloc_skb(size + sizeof(*th), sk->sk_allocation);
 	if (!skb)
 		goto err;

Signature · 1 line

1.7.6.5

David Miller

maintainer Applied

2012-11-03 02:02 UTC #1 lore raw

From: Pavel Emelyanov <[email protected]>
Date: Mon, 29 Oct 2012 19:05:33 +0400

Quoted 7 lines

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]>

Applied, thanks.

Quoted 6 lines

From 8f70f4ea4f509a3772ee7eb5d9d5c2571a86652a Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <[email protected]>
Date: Mon, 29 Oct 2012 18:12:41 +0400
Subject: [PATCH] fix for repair queue getback
Signed-off-by Pavel Emelyanov <[email protected]>

What is this?

Pavel Emelyanov

author

2012-11-03 16:15 UTC #2 lore raw

Quoted 13 lines · David Miller

From: Pavel Emelyanov <[email protected]>
Date: Mon, 29 Oct 2012 19:05:33 +0400
Quoted 7 lines
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]>
Applied, thanks.

Quoted 8 lines

Quoted 6 lines
From 8f70f4ea4f509a3772ee7eb5d9d5c2571a86652a Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <[email protected]>
Date: Mon, 29 Oct 2012 18:12:41 +0400
Subject: [PATCH] fix for repair queue getback
Signed-off-by Pavel Emelyanov <[email protected]>
What is this?

It's a garbage left after patches rebase and resplit. Sorry for that :(

Quoted 5 lines

--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html