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) */