diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-24 14:19:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-24 14:19:00 -0700 |
| commit | c953d60b1180c4a59a55b72fecd278d264d60f5b (patch) | |
| tree | 6f390832ac0c7f1300459ce7cc226c6c105bbe08 | |
| parent | c6d686047456bd3e36dce7de95375890fb8b7dd9 (diff) | |
| parent | 5fff09bc141570cd15c118b097b17dec832b517f (diff) | |
| download | linux-c953d60b1180c4a59a55b72fecd278d264d60f5b.tar.bz2 | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into master
Pull xtensa csum regression fix from Al Viro:
"Max Filippov caught a breakage introduced in xtensa this cycle
by the csum_and_copy_..._user() series.
Cut'n'paste from the wrong source - the check that belongs
in csum_and_copy_to_user() ended up both there and in
csum_and_copy_from_user()"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
xtensa: fix access check in csum_and_copy_from_user
| -rw-r--r-- | arch/xtensa/include/asm/checksum.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/checksum.h b/arch/xtensa/include/asm/checksum.h index d8292cc9ebdf..243a5fe79d3c 100644 --- a/arch/xtensa/include/asm/checksum.h +++ b/arch/xtensa/include/asm/checksum.h @@ -57,7 +57,7 @@ static inline __wsum csum_and_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr) { - if (access_ok(dst, len)) + if (access_ok(src, len)) return csum_partial_copy_generic((__force const void *)src, dst, len, sum, err_ptr, NULL); if (len) |