diff --git a/[refs] b/[refs] index dac9cb1a0f39..79938cba6915 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 042a53a9e437feaf2230dd2cadcecfae9c7bfe05 +refs/heads/master: d2d27bfd11659675fdd1c20b1c7f8f59873cad60 diff --git a/trunk/net/core/datagram.c b/trunk/net/core/datagram.c index e2a36f05cdf7..774bcd9119d9 100644 --- a/trunk/net/core/datagram.c +++ b/trunk/net/core/datagram.c @@ -466,7 +466,8 @@ int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset, if (copy > 0) { if (copy > len) copy = len; - if (memcpy_fromiovecend(skb->data + offset, from, 0, copy)) + if (memcpy_fromiovecend(skb->data + offset, from, from_offset, + copy)) goto fault; if ((len -= copy) == 0) return 0;