From 9f0b537e82c17fd10eac45847e0249faf1864a9f Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 6 Sep 2007 14:06:35 +0100
Subject: [PATCH] --- yaml --- r: 64791 b: refs/heads/master c:
 ef8aef55ce61fd0e2af798695f7386ac756ae1e7 h: refs/heads/master i:   64789:
 8eefe4c058a336dca5347d1efd05deb38fb9e5eb   64787:
 ea9a09a1c5802d28d7a6a6816124880ca9871b82   64783:
 a5fe308b86505a00fc024dea3bc4a2ab4d5f002d v: v3

---
 [refs]                    | 2 +-
 trunk/net/core/datagram.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 183a678519f9..f5d629c3d9c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fbe43f6f631dd7ce19fb1499d6164a5bdb34568
+refs/heads/master: ef8aef55ce61fd0e2af798695f7386ac756ae1e7
diff --git a/trunk/net/core/datagram.c b/trunk/net/core/datagram.c
index cb056f476126..029b93e246b4 100644
--- a/trunk/net/core/datagram.c
+++ b/trunk/net/core/datagram.c
@@ -450,6 +450,9 @@ int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
 	__wsum csum;
 	int chunk = skb->len - hlen;
 
+	if (!chunk)
+		return 0;
+
 	/* Skip filled elements.
 	 * Pretty silly, look at memcpy_toiovec, though 8)
 	 */