From 5f42265e998fd0d3fc1a9f9e9231e355bce088ec Mon Sep 17 00:00:00 2001
From: Sridhar Samudrala <sri@us.ibm.com>
Date: Fri, 5 Jun 2009 09:35:44 +0000
Subject: [PATCH] --- yaml --- r: 150743 b: refs/heads/master c:
 2faef52b72958b8b1c08e927b9b0691c314cf6f4 h: refs/heads/master i:   150741:
 3765d2d915516508868dc772294c60e87be21851   150739:
 2a92ff46bf89d13adf8b7dd32aca6ca7f94f6c58   150735:
 78cf4ba76d8bd5c7904e7faa6e13a5d307509343 v: v3

---
 [refs]                 | 2 +-
 trunk/net/core/iovec.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 79938cba6915..df9678e9dbda 100644
--- 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
index 40a76ce19d9f..16ad45d4882b 100644
--- 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;
 	}