diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-02-15 09:06:39 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-02-15 09:07:01 +0100 |
| commit | de1528ee7cb7c161444dadbc971d050bebb5cbe7 (patch) | |
| tree | a1f53cd279966802de097c0f0f6625b49e6903f1 /lib/iov_iter.c | |
| parent | 0d3070f5e6551d8a759619e85736e49a3bf40398 (diff) | |
| parent | 15447b64789d9ade71eb374d5ae1f37d0bbce0bd (diff) | |
Merge branch 'for-next' into for-linus
Unification of 5.12-devel branches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'lib/iov_iter.c')
| -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 1635111c5bd2..a21e6a5792c5 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1658,7 +1658,7 @@ static int copy_compat_iovec_from_user(struct iovec *iov, (const struct compat_iovec __user *)uvec; int ret = -EFAULT, i; - if (!user_access_begin(uvec, nr_segs * sizeof(*uvec))) + if (!user_access_begin(uiov, nr_segs * sizeof(*uiov))) return -EFAULT; for (i = 0; i < nr_segs; i++) { |