---

yaml --- r: 150742 b: refs/heads/master c: d2d27bf h: refs/heads/master v: v3
git-mirror · Jun 8, 2009 · 6644017 · 6644017
1 parent 3765d2d
commit 6644017
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;