Browse Source

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()
Linus Torvalds 8 years ago
parent
commit
8c9a694dc0
1 changed files with 1 additions and 1 deletions
  1. 1 1
      lib/iov_iter.c

+ 1 - 1
lib/iov_iter.c

@@ -798,7 +798,7 @@ void iov_iter_revert(struct iov_iter *i, size_t unroll)
 		while (1) {
 		while (1) {
 			size_t n = off - pipe->bufs[idx].offset;
 			size_t n = off - pipe->bufs[idx].offset;
 			if (unroll < n) {
 			if (unroll < n) {
-				off -= (n - unroll);
+				off -= unroll;
 				break;
 				break;
 			}
 			}
 			unroll -= n;
 			unroll -= n;