Commit 917bbdb1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull ITER_PIPE fix from Al Viro:
 "Fix for old sloppiness in pipe_buffer reuse"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  lib/iov_iter: initialize "flags" in new pipe_buffer
parents 038101e6 9d2231c5

lib/iov_iter.c

+2 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ static size_t copy_page_to_iter_pipe(struct page *page, size_t offset, size_t by 
		return 0;



	buf->ops = &page_cache_pipe_buf_ops;

	buf->flags = 0;

	get_page(page);

	buf->page = page;

	buf->offset = offset;
@@ -577,6 +578,7 @@ static size_t push_pipe(struct iov_iter *i, size_t size, 
			break;



		buf->ops = &default_pipe_buf_ops;

		buf->flags = 0;

		buf->page = page;

		buf->offset = 0;

		buf->len = min_t(ssize_t, left, PAGE_SIZE);