Skip to content

Commit c953d60

Browse files
committed
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
2 parents c6d6860 + 5fff09b commit c953d60

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/xtensa/include/asm/checksum.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static inline
5757
__wsum csum_and_copy_from_user(const void __user *src, void *dst,
5858
int len, __wsum sum, int *err_ptr)
5959
{
60-
if (access_ok(dst, len))
60+
if (access_ok(src, len))
6161
return csum_partial_copy_generic((__force const void *)src, dst,
6262
len, sum, err_ptr, NULL);
6363
if (len)

0 commit comments

Comments
 (0)