diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2019-01-04 22:07:47 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-01-04 22:07:47 +1100 |
commit | d538d94f0ca86cfedc892cc427169219acb3c2f7 (patch) | |
tree | 8363c4ff35907edb5245da737d7f6982bf22b945 /arch/xtensa/include/asm/checksum.h | |
parent | KVM: PPC: Book3S HV: radix: Fix uninitialized var build error (diff) | |
parent | Remove 'type' argument from access_ok() function (diff) | |
download | linux-dev-d538d94f0ca86cfedc892cc427169219acb3c2f7.tar.xz linux-dev-d538d94f0ca86cfedc892cc427169219acb3c2f7.zip |
Merge branch 'master' into fixes
We have a fix to apply on top of commit 96d4f267e40f ("Remove 'type'
argument from access_ok() function"), so merge master to get it.
Diffstat (limited to 'arch/xtensa/include/asm/checksum.h')
-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 3ae74d7e074b..f302ef57973a 100644 --- a/arch/xtensa/include/asm/checksum.h +++ b/arch/xtensa/include/asm/checksum.h @@ -243,7 +243,7 @@ static __inline__ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len, __wsum sum, int *err_ptr) { - if (access_ok(VERIFY_WRITE, dst, len)) + if (access_ok(dst, len)) return csum_partial_copy_generic(src,dst,len,sum,NULL,err_ptr); if (len) |