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

torvalds · torvalds · commit 8c9a694dc046 · 2017-04-29T14:00:42.000-07:00
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()
diff --git a/lib/iov_iter.c b/lib/iov_iter.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,7 @@ void iov_iter_revert(struct iov_iter *i, size_t unroll)`
`798`	`798`	`while (1) {`
`799`	`799`	`size_t n = off - pipe->bufs[idx].offset;`
`800`	`800`	`if (unroll < n) {`
`801`		`- off -= (n - unroll);`
	`801`	`+ off -= unroll;`
`802`	`802`	`break;`
`803`	`803`	`}`
`804`	`804`	`unroll -= n;`