Commit 339fbf67 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull vfs fix from Al Viro:
 "Braino fix for iov_iter_revert() misuse"

* 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix braino in generic_file_read_iter()
parents 8ee74a91 5b47d59a

lib/iov_iter.c

+2 −0
Original line number Diff line number Diff line
@@ -790,6 +790,8 @@ void iov_iter_revert(struct iov_iter *i, size_t unroll) 
{

	if (!unroll)

		return;

	if (WARN_ON(unroll > MAX_RW_COUNT))

		return;

	i->count += unroll;

	if (unlikely(i->type & ITER_PIPE)) {

		struct pipe_inode_info *pipe = i->pipe;

mm/filemap.c

+1 −1
Original line number Diff line number Diff line
@@ -2050,7 +2050,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) 
			iocb->ki_pos += retval;

			count -= retval;

		}

		iov_iter_revert(iter, iov_iter_count(iter) - count);

		iov_iter_revert(iter, count - iov_iter_count(iter));



		/*

		 * Btrfs can have a short DIO read if we encounter