diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2020-02-18 12:56:09 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-05-29 16:11:48 -0400 |
| commit | bfdaf029c9c95072359fd0870c282e53953220f6 (patch) | |
| tree | 028cb7c8c27e0df0a95ed325658c1c9db2657424 | |
| parent | cc03f19cfd45f44a75f0445c5be0073bbd3dda1c (diff) | |
| download | microwatt-bfdaf029c9c95072359fd0870c282e53953220f6.tar.gz | |
ia64: turn csum_partial_copy_from_user() into csum_and_copy_from_user()
Just use copy_from_user() there, rather than relying upon the wrapper
to have done access_ok()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | arch/ia64/include/asm/checksum.h | 3 | ||||
| -rw-r--r-- | arch/ia64/lib/csum_partial_copy.c | 18 |
2 files changed, 6 insertions, 15 deletions
diff --git a/arch/ia64/include/asm/checksum.h b/arch/ia64/include/asm/checksum.h index 0ed18bc3f6cf2f..279ea4dcee7928 100644 --- a/arch/ia64/include/asm/checksum.h +++ b/arch/ia64/include/asm/checksum.h @@ -37,13 +37,14 @@ extern __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, */ extern __wsum csum_partial(const void *buff, int len, __wsum sum); +#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER /* * Same as csum_partial, but copies from src while it checksums. * * Here it is even more important to align src and dst on a 32-bit (or * even better 64-bit) boundary. */ -extern __wsum csum_partial_copy_from_user(const void __user *src, void *dst, +extern __wsum csum_and_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *errp); diff --git a/arch/ia64/lib/csum_partial_copy.c b/arch/ia64/lib/csum_partial_copy.c index 9ab570d0f756de..ab59eb3999006c 100644 --- a/arch/ia64/lib/csum_partial_copy.c +++ b/arch/ia64/lib/csum_partial_copy.c @@ -103,33 +103,23 @@ out: * This is very ugly but temporary. THIS NEEDS SERIOUS ENHANCEMENTS. * But it's very tricky to get right even in C. */ -extern unsigned long do_csum(const unsigned char *, long); - __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 psum, int *errp) { - unsigned long result; - /* XXX Fixme * for now we separate the copy from checksum for obvious * alignment difficulties. Look at the Alpha code and you'll be * scared. */ - if (__copy_from_user(dst, src, len) != 0 && errp) + if (copy_from_user(dst, src, len)) *errp = -EFAULT; - result = do_csum(dst, len); - - /* add in old sum, and carry.. */ - result += (__force u32)psum; - /* 32+c bits -> 32 bits */ - result = (result & 0xffffffff) + (result >> 32); - return (__force __wsum)result; + return csum_partial(dst, len, psum); } -EXPORT_SYMBOL(csum_partial_copy_from_user); +EXPORT_SYMBOL(csum_and_copy_from_user); __wsum csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum) |