diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-17 21:16:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-17 21:16:47 +0100 |
| commit | a527a2b32d20a2bd8070f49e98cb1a89b0c98bb3 (patch) | |
| tree | a2a0368ddb9dd05a570549ce58e9b5c57f1e50c7 /lib | |
| parent | mm: don't put pinned pages into the swap cache (diff) | |
| parent | dump_common_audit_data(): fix racy accesses to ->d_name (diff) | |
| download | linux-a527a2b32d20a2bd8070f49e98cb1a89b0c98bb3.tar.xz linux-a527a2b32d20a2bd8070f49e98cb1a89b0c98bb3.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs fixes from Al Viro:
"Several assorted fixes.
I still think that audit ->d_name race is better fixed this way for
the benefit of backports, with any possibly fancier variants done on
top of it"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
dump_common_audit_data(): fix racy accesses to ->d_name
iov_iter: fix the uaccess area in copy_compat_iovec_from_user
umount(2): move the flag validity checks first
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 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++) { |