summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2005-11-02 18:55:00 +1100
committerArnaldo Carvalho de Melo <acme@mandriva.com>2005-11-02 22:25:04 -0200
commitc75d721c761ad0f2d8725c40af9e4f376efefd24 (patch)
treeee282f7fd6e465d7b031d64b9ed7c03233ea94cf
parentc2da8acaf488b8651edfb04ebf3ab089f3a7830f (diff)
downloadlinux-3.10-c75d721c761ad0f2d8725c40af9e4f376efefd24.tar.gz
linux-3.10-c75d721c761ad0f2d8725c40af9e4f376efefd24.tar.bz2
linux-3.10-c75d721c761ad0f2d8725c40af9e4f376efefd24.zip
[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: Arnaldo Carvalho de Melo <acme@mandriva.com>
-rw-r--r--net/core/datagram.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 81987df536e..d219435d086 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;