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; }