diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-10 16:02:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-10 16:02:54 -0700 |
| commit | 4382a79b2746faf9db98a34ae1a1cbd364473f75 (patch) | |
| tree | 1bd6e40c0120cef455b6e6294df0cea10fe13be0 /include | |
| parent | 79ca035d2d941839f55f3b8b69f8e81c66946ed8 (diff) | |
| parent | b7e4b65f3fe92abbf4a1f57987a54c820969aebd (diff) | |
| download | linux-4382a79b2746faf9db98a34ae1a1cbd364473f75.tar.bz2 | |
Merge branch 'uaccess.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc uaccess updates from Al Viro:
"Assorted uaccess patches for this cycle - the stuff that didn't fit
into thematic series"
* 'uaccess.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
bpf: make bpf_check_uarg_tail_zero() use check_zeroed_user()
x86: kvm_hv_set_msr(): use __put_user() instead of 32bit __clear_user()
user_regset_copyout_zero(): use clear_user()
TEST_ACCESS_OK _never_ had been checked anywhere
x86: switch cp_stat64() to unsafe_put_user()
binfmt_flat: don't use __put_user()
binfmt_elf_fdpic: don't use __... uaccess primitives
binfmt_elf: don't bother with __{put,copy_to}_user()
pselect6() and friends: take handling the combined 6th/7th args into helper
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/regset.h b/include/linux/regset.h index bf0243779738..46d6ae68c455 100644 --- a/include/linux/regset.h +++ b/include/linux/regset.h @@ -320,7 +320,7 @@ static inline int user_regset_copyout_zero(unsigned int *pos, if (*kbuf) { memset(*kbuf, 0, copy); *kbuf += copy; - } else if (__clear_user(*ubuf, copy)) + } else if (clear_user(*ubuf, copy)) return -EFAULT; else *ubuf += copy; |