From: David Laight <[email protected]>
To: "[email protected]" <[email protected]>,
"[email protected]" <[email protected]>,
"[email protected]" <[email protected]>,
Jens Axboe <[email protected]>,
"David S. Miller" <[email protected]>,
Al Viro <[email protected]>,
linux-fsdevel <[email protected]>
Subject: [PATCH 1/9 next] mm:process_vm_access Call import_iovec() instead of rw_copy_check_uvector()
Date: Tue, 15 Sep 2020 14:55:08 +0000 [thread overview]
Message-ID: <[email protected]> (raw)
This is the only direct call of rw_copy_check_uvector().
Removing it lets rw_copy_check_uvector() be inlined into
import_iovec() and the horrid calling conventions fixed.
Signed-off-by: David Laight <[email protected]>
---
mm/process_vm_access.c | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
index 29c052099aff..1cc3d6f66b31 100644
--- a/mm/process_vm_access.c
+++ b/mm/process_vm_access.c
@@ -264,7 +264,7 @@ static ssize_t process_vm_rw(pid_t pid,
struct iovec iovstack_r[UIO_FASTIOV];
struct iovec *iov_l = iovstack_l;
struct iovec *iov_r = iovstack_r;
- struct iov_iter iter;
+ struct iov_iter iter_l, iter_r;
ssize_t rc;
int dir = vm_write ? WRITE : READ;
@@ -272,23 +272,24 @@ static ssize_t process_vm_rw(pid_t pid,
return -EINVAL;
/* Check iovecs */
- rc = import_iovec(dir, lvec, liovcnt, UIO_FASTIOV, &iov_l, &iter);
+ rc = import_iovec(dir, lvec, liovcnt, UIO_FASTIOV, &iov_l, &iter_l);
if (rc < 0)
return rc;
- if (!iov_iter_count(&iter))
+ if (!iov_iter_count(&iter_l))
goto free_iovecs;
- rc = rw_copy_check_uvector(CHECK_IOVEC_ONLY, rvec, riovcnt, UIO_FASTIOV,
- iovstack_r, &iov_r);
+ rc = import_iovec(CHECK_IOVEC_ONLY, rvec, riovcnt, UIO_FASTIOV, &iov_r, &iter_r);
if (rc <= 0)
goto free_iovecs;
- rc = process_vm_rw_core(pid, &iter, iov_r, riovcnt, flags, vm_write);
+ rc = process_vm_rw_core(pid, &iter_l, iter_r.iov, iter_r.nr_segs,
+ flags, vm_write);
free_iovecs:
if (iov_r != iovstack_r)
kfree(iov_r);
- kfree(iov_l);
+ if (iov_l != iovstack_l)
+ kfree(iov_l);
return rc;
}
@@ -322,30 +323,30 @@ compat_process_vm_rw(compat_pid_t pid,
struct iovec iovstack_r[UIO_FASTIOV];
struct iovec *iov_l = iovstack_l;
struct iovec *iov_r = iovstack_r;
- struct iov_iter iter;
+ struct iov_iter iter_l, iter_r;
ssize_t rc = -EFAULT;
int dir = vm_write ? WRITE : READ;
if (flags != 0)
return -EINVAL;
- rc = compat_import_iovec(dir, lvec, liovcnt, UIO_FASTIOV, &iov_l, &iter);
+ rc = compat_import_iovec(dir, lvec, liovcnt, UIO_FASTIOV, &iov_l, &iter_l);
if (rc < 0)
return rc;
- if (!iov_iter_count(&iter))
+ if (!iov_iter_count(&iter_l))
goto free_iovecs;
- rc = compat_rw_copy_check_uvector(CHECK_IOVEC_ONLY, rvec, riovcnt,
- UIO_FASTIOV, iovstack_r,
- &iov_r);
+ rc = compat_import_iovec(0, rvec, riovcnt, UIO_FASTIOV, &iov_r, &iter_r);
if (rc <= 0)
goto free_iovecs;
- rc = process_vm_rw_core(pid, &iter, iov_r, riovcnt, flags, vm_write);
+ rc = process_vm_rw_core(pid, &iter_l, iter_r.iov, iter_r.nr_segs,
+ flags, vm_write);
free_iovecs:
if (iov_r != iovstack_r)
kfree(iov_r);
- kfree(iov_l);
+ if (iov_l != iovstack_l)
+ kfree(iov_l);
return rc;
}
--
2.25.1
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
next reply other threads:[~2020-09-15 23:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 14:55 David Laight [this message]
2020-09-21 14:09 ` [PATCH 1/9 next] mm:process_vm_access Call import_iovec() instead of rw_copy_check_uvector() Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox