| From 0e8f0d67401589a141950856902c7d0ec8d9c985 Mon Sep 17 00:00:00 2001 |
| From: Al Viro <viro@zeniv.linux.org.uk> |
| Date: Wed, 2 Jun 2021 14:48:21 -0400 |
| Subject: [xarray] iov_iter_fault_in_readable() should do nothing in xarray case |
| |
| From: Al Viro <viro@zeniv.linux.org.uk> |
| |
| 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> |
| |
| --- |
| lib/iov_iter.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/lib/iov_iter.c |
| +++ b/lib/iov_iter.c |
| @@ -434,7 +434,7 @@ int iov_iter_fault_in_readable(struct io |
| 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)) |