Skip to content

Commit

Permalink
mips: csum_and_copy_{to,from}_user() are never called under KERNEL_DS
Browse files Browse the repository at this point in the history
they are only called for iovec-backed iov_iter and under KERNEL_DS an
attempt to create such a beast will yield a kvec-backed one.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Aug 20, 2020
1 parent ab5e8b3 commit c44ac3c
Showing 1 changed file with 7 additions and 25 deletions.
32 changes: 7 additions & 25 deletions arch/mips/include/asm/checksum.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,6 @@ __wsum __csum_partial_copy_from_user(const void *src, void *dst,
int len, __wsum sum, int *err_ptr);
__wsum __csum_partial_copy_to_user(const void *src, void *dst,
int len, __wsum sum, int *err_ptr);
/*
* this is a new version of the above that records errors it finds in *errp,
* but continues and zeros the rest of the buffer.
*/
static inline
__wsum csum_partial_copy_from_user(const void __user *src, void *dst, int len,
__wsum sum, int *err_ptr)
{
might_fault();
if (uaccess_kernel())
return __csum_partial_copy_kernel((__force void *)src, dst,
len, sum, err_ptr);
else
return __csum_partial_copy_from_user((__force void *)src, dst,
len, sum, err_ptr);
}

#define _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
static inline
Expand All @@ -65,9 +49,12 @@ __wsum csum_and_copy_from_user(const void __user *src, void *dst, int len)
__wsum sum = ~0U;
int err = 0;

might_fault();

if (!access_ok(src, len))
return 0;
sum = csum_partial_copy_from_user(src, dst, len, sum, &err);
sum = __csum_partial_copy_from_user((__force void *)src, dst,
len, sum, &err);
return err ? 0 : sum;
}

Expand All @@ -84,14 +71,9 @@ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len)
might_fault();
if (!access_ok(dst, len))
return 0;
if (uaccess_kernel())
sum = __csum_partial_copy_kernel(src,
(__force void *)dst,
len, sum, &err);
else
sum = __csum_partial_copy_to_user(src,
(__force void *)dst,
len, sum, &err);
sum = __csum_partial_copy_to_user(src,
(__force void *)dst,
len, sum, &err);
return err ? 0 : sum;
}

Expand Down

0 comments on commit c44ac3c

Please sign in to comment.