diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-02 08:47:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-02 08:47:35 +0100 |
| commit | 48a3d90adafc9ed92d19c93d011f17ec9001cc34 (patch) | |
| tree | 868f62da2306ddabd6eca57eb6ea2a18ac18995f /mm/process_vm_access.c | |
| parent | 3f7566f4947834db9b36aeb8b308e91448ba74fc (diff) | |
| parent | 3cea11cd5e3b00d91caf0b4730194039b45c5891 (diff) | |
Merge 5.10-rc2 into char-misc-next
We need the fixes/changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/process_vm_access.c')
| -rw-r--r-- | mm/process_vm_access.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c index fd12da80b6f2..702250f148e7 100644 --- a/mm/process_vm_access.c +++ b/mm/process_vm_access.c @@ -5,6 +5,7 @@ * Copyright (C) 2010-2011 Christopher Yeoh <cyeoh@au1.ibm.com>, IBM Corp. */ +#include <linux/compat.h> #include <linux/mm.h> #include <linux/uio.h> #include <linux/sched.h> @@ -273,7 +274,8 @@ static ssize_t process_vm_rw(pid_t pid, return rc; if (!iov_iter_count(&iter)) goto free_iov_l; - iov_r = iovec_from_user(rvec, riovcnt, UIO_FASTIOV, iovstack_r, false); + iov_r = iovec_from_user(rvec, riovcnt, UIO_FASTIOV, iovstack_r, + in_compat_syscall()); if (IS_ERR(iov_r)) { rc = PTR_ERR(iov_r); goto free_iov_l; |