diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-10 10:13:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-10 10:13:45 -0700 |
| commit | 1d07b6cb96bc17f844a0218ec783f017cc2d29ee (patch) | |
| tree | 464f0b15272eb06a8caf82b2e8db44959baa554a /include | |
| parent | a91ab911df51ac364e594d5950ed508d91091498 (diff) | |
| parent | c43aeb198048f64abda8655fdcdebe71cf1877ba (diff) | |
| download | linux-1d07b6cb96bc17f844a0218ec783f017cc2d29ee.tar.bz2 | |
Merge branch 'fix-uio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull copy*_iter fix from Al Viro.
[ Al used entirely the wrong return value. Oopsie. ]
* 'fix-uio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fix brown paperbag bug in inlined copy_..._iter()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/uio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h index 342d2dc225b9..8a642cda641c 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -103,7 +103,7 @@ static __always_inline __must_check size_t copy_to_iter(const void *addr, size_t bytes, struct iov_iter *i) { if (unlikely(!check_copy_size(addr, bytes, true))) - return bytes; + return 0; else return _copy_to_iter(addr, bytes, i); } @@ -112,7 +112,7 @@ static __always_inline __must_check size_t copy_from_iter(void *addr, size_t bytes, struct iov_iter *i) { if (unlikely(!check_copy_size(addr, bytes, false))) - return bytes; + return 0; else return _copy_from_iter(addr, bytes, i); } @@ -130,7 +130,7 @@ static __always_inline __must_check size_t copy_from_iter_nocache(void *addr, size_t bytes, struct iov_iter *i) { if (unlikely(!check_copy_size(addr, bytes, false))) - return bytes; + return 0; else return _copy_from_iter_nocache(addr, bytes, i); } @@ -160,7 +160,7 @@ static __always_inline __must_check size_t copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i) { if (unlikely(!check_copy_size(addr, bytes, false))) - return bytes; + return 0; else return _copy_from_iter_flushcache(addr, bytes, i); } |