Commit a506abc7 authored by Al Viro's avatar Al Viro
Browse files

copy_page_to_iter(): fix ITER_DISCARD case 



we need to advance the iterator...

Cc: stable@vger.kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 08aa6479

lib/iov_iter.c

+5 −2
Original line number Diff line number Diff line
@@ -965,9 +965,12 @@ static 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);