summaryrefslogtreecommitdiff
path: root/arch/x86/lib
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2020-02-17 00:50:00 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2020-05-29 23:11:48 +0300
commit0a5ea224b2fdf9dca9291ef7b5a12fd846a5dc34 (patch)
tree1a4dac4be2cf16690a41bf9e80cb34d812df7c80 /arch/x86/lib
parent73e800ecb67bf24c0508c63350c1dc509f00b1ce (diff)
downloadlinux-0a5ea224b2fdf9dca9291ef7b5a12fd846a5dc34.tar.xz
x86: switch both 32bit and 64bit to providing csum_and_copy_from_user()
... rather than messing with the wrapper. As a side effect, 32bit variant gets access_ok() into it and can be switched to user_access_begin()/user_access_end() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/x86/lib')
-rw-r--r--arch/x86/lib/csum-wrappers_64.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
index 7028d1dc5c6b..ee63d7576fd2 100644
--- a/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
@@ -10,7 +10,7 @@
#include <asm/smap.h>
/**
- * csum_partial_copy_from_user - Copy and checksum from user space.
+ * csum_and_copy_from_user - Copy and checksum from user space.
* @src: source address (user space)
* @dst: destination address
* @len: number of bytes to be copied.
@@ -21,7 +21,7 @@
* src and dst are best aligned to 64bits.
*/
__wsum
-csum_partial_copy_from_user(const void __user *src, void *dst,
+csum_and_copy_from_user(const void __user *src, void *dst,
int len, __wsum isum, int *errp)
{
might_sleep();
@@ -68,7 +68,7 @@ out_err:
return isum;
}
-EXPORT_SYMBOL(csum_partial_copy_from_user);
+EXPORT_SYMBOL(csum_and_copy_from_user);
/**
* csum_and_copy_to_user - Copy and checksum to user space.