copy_page_to_iter(): fix ITER_DISCARD case

commit a506abc7b644d71966a75337d5a534f531b3cdc4 upstream.

we need to advance the iterator...

Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/lib/iov_iter.c b/lib/iov_iter.c
index f0b2ccb1bb0182694733683501b55dc4d7dc2bb2..018ac4b1aa3c42cbb76c188d1e8562441e45a80c 100644 (file)
--- a/lib/iov_iter.c
+++ b/lib/iov_iter.c
@@ -922,9 +922,12 @@ size_t copy_page_to_iter(struct page *page, size_t offset, size_t bytes,
                size_t wanted = copy_to_iter(kaddr + offset, bytes, i);
                kunmap_atomic(kaddr);
                return wanted;
-       } else if (unlikely(iov_iter_is_discard(i)))
+       } else if (unlikely(iov_iter_is_discard(i))) {
+               if (unlikely(i->count < bytes))
+                       bytes = i->count;
+               i->count -= bytes;
                return bytes;
-       else if (likely(!iov_iter_is_pipe(i)))
+       } else if (likely(!iov_iter_is_pipe(i)))
                return copy_page_to_iter_iovec(page, offset, bytes, i);
        else
                return copy_page_to_iter_pipe(page, offset, bytes, i);