Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / net / core / iovec.c

diff --git a/net/core/iovec.c b/net/core/iovec.c
index 40a76ce..16ad45d 100644 (file)
--- a/net/core/iovec.c
+++ b/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;
        }