---

yaml --- r: 150743 b: refs/heads/master c: 2faef52 h: refs/heads/master i: 150741: 3765d2d 150739: 2a92ff4 150735: 78cf4ba v: v3
git-mirror · Jun 8, 2009 · 5f42265 · 5f42265
1 parent 6644017
commit 5f42265
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2d27bfd11659675fdd1c20b1c7f8f59873cad60
+refs/heads/master: 2faef52b72958b8b1c08e927b9b0691c314cf6f4
diff --git a/trunk/net/core/iovec.c b/trunk/net/core/iovec.c
@@ -112,9 +112,9 @@ int memcpy_toiovecend(const struct iovec *iov, unsigned char *kdata,
 			continue;
 		}
 		copy = min_t(unsigned int, iov->iov_len - offset, len);
-		offset = 0;
-		if (copy_to_user(iov->iov_base, kdata, copy))
+		if (copy_to_user(iov->iov_base + offset, kdata, copy))
 			return -EFAULT;
+		offset = 0;
 		kdata += copy;
 		len -= copy;
 	}