From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 9 Nov 2005 18:22:12 +0000 (-0800)
Subject: [PATCH] NET: Fix zero-size datagram reception
X-Git-Tag: v2.6.14.2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2feb75c74db778c244719a5736b2b1dde914bb0c;p=thirdparty%2Fkernel%2Fstable.git

[PATCH] NET: Fix zero-size datagram reception

The recent rewrite of skb_copy_datagram_iovec broke the reception of
zero-size datagrams.  This patch fixes it.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 81987df536eb8..d219435d086c8 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -213,6 +213,10 @@ int skb_copy_datagram_iovec(const struct sk_buff *skb, int offset,
 {
 	int i, err, fraglen, end = 0;
 	struct sk_buff *next = skb_shinfo(skb)->frag_list;
+
+	if (!len)
+		return 0;
+
 next_skb:
 	fraglen = skb_headlen(skb);
 	i = -1;