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:55:39 +0200 |
| commit | 7b0393e6f6c86d5f1b01befebd2bf445d0f4ff94 (patch) | |
| tree | c0b59d191729755ec8f7c2500e6973e5d89740c1 /lib | |
| parent | b6df9e43d52deed1e3bb9a58b6ab3329049a945e (diff) | |
| download | linux-stable-7b0393e6f6c86d5f1b01befebd2bf445d0f4ff94.tar.gz linux-stable-7b0393e6f6c86d5f1b01befebd2bf445d0f4ff94.tar.bz2 linux-stable-7b0393e6f6c86d5f1b01befebd2bf445d0f4ff94.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>
Diffstat (limited to 'lib')
| -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 018ac4b1aa3c..537bfdc8cd09 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -434,7 +434,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)) |