diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-30 00:00:42 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-30 00:00:42 +0300 |
| commit | 8c9a694dc046fab9dff249555860460b92990b52 (patch) | |
| tree | c29f73816ea252fbfffa52a2a81981725d1e9f26 | |
| parent | 0060e79a1f5231940ef38e6621745c0c808065cb (diff) | |
| parent | 4fa55cefee1bbecadb4c9f47d40a92f65dc44351 (diff) | |
| download | linux-8c9a694dc046fab9dff249555860460b92990b52.tar.xz | |
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()
| -rw-r--r-- | lib/iov_iter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 60abc44385b7..cc001a542cb5 100644 --- 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; |