diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2021-06-02 14:48:21 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-14 16:53:01 +0200 |
| commit | 63e68b5636495459704b7e7812fffd9f4a8dca8c (patch) | |
| tree | 63e7eac263596b7ce14a7a858d0c4a6c691747d8 | |
| parent | 846ae1d87931e6fd4fe48dec335b5e07943bdadb (diff) | |
| download | linux-stable-63e68b5636495459704b7e7812fffd9f4a8dca8c.tar.gz linux-stable-63e68b5636495459704b7e7812fffd9f4a8dca8c.tar.bz2 linux-stable-63e68b5636495459704b7e7812fffd9f4a8dca8c.zip | |
iov_iter_fault_in_readable() should do nothing in xarray case
commit 0e8f0d67401589a141950856902c7d0ec8d9c985 upstream.
... and actually should just check it's given an iovec-backed iterator
in the first place.
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 9450e1965759..41b06af19536 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -422,7 +422,7 @@ int iov_iter_fault_in_readable(struct iov_iter *i, size_t bytes) int err; struct iovec v; - if (!(i->type & (ITER_BVEC|ITER_KVEC))) { + if (iter_is_iovec(i)) { iterate_iovec(i, bytes, v, iov, skip, ({ err = fault_in_pages_readable(v.iov_base, v.iov_len); if (unlikely(err)) |