Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c9a694d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull iov iter fix from Al Viro.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix a braino in ITER_PIPE iov_iter_revert()
parents 0060e79a 4fa55cef

lib/iov_iter.c

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ void iov_iter_revert(struct iov_iter *i, size_t unroll) 
		while (1) {

			size_t n = off - pipe->bufs[idx].offset;

			if (unroll < n) {

				off -= (n - unroll);

				off -= unroll;

				break;

			}

			unroll -= n;