git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-05-02 18:17:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

ppc: propagate the calling conventions change down to csum_partial_copy_generic()

Browse Source 
... and get rid of the pointless fallback in the wrappers.  On error it used
to zero the unwritten area and calculate the csum of the entire thing.  Not
wanting to do it in assembler part had been very reasonable; doing that in
the first place, OTOH...  In case of an error the caller discards the data
we'd copied, along with whatever checksum it might've had.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2020-07-20 10:09:24 -04:00
parent daf52375c1
commit 70d65cd555
4 changed files with 46 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/powerpc/lib/checksum_wrappers.c
View File

@@ -14,8 +14,7 @@
__wsum csum_and_copy_from_user(const void __user *src, void *dst,
int len)
{
unsigned int csum;
int err = 0;
__wsum csum;
might_sleep();
@@ -24,27 +23,16 @@ __wsum csum_and_copy_from_user(const void __user *src, void *dst,
allow_read_from_user(src, len);
csum = csum_partial_copy_generic((void __force *)src, dst,
len, ~0U, &err, NULL);
if (unlikely(err)) {
int missing = __copy_from_user(dst, src, len);
if (missing)
csum = 0;
else
csum = csum_partial(dst, len, ~0U);
}
csum = csum_partial_copy_generic((void __force *)src, dst, len);
prevent_read_from_user(src, len);
return (__force __wsum)csum;
return csum;
}
EXPORT_SYMBOL(csum_and_copy_from_user);
__wsum csum_and_copy_to_user(const void *src, void __user *dst, int len)
{
unsigned int csum;
int err = 0;
__wsum csum;
might_sleep();
if (unlikely(!access_ok(dst, len)))
@@ -52,17 +40,9 @@ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len)
allow_write_to_user(dst, len);
csum = csum_partial_copy_generic(src, (void __force *)dst,
len, ~0U, NULL, &err);
if (unlikely(err)) {
csum = csum_partial(src, len, ~0U);
if (copy_to_user(dst, src, len))
csum = 0;
}
csum = csum_partial_copy_generic(src, (void __force *)dst, len);
prevent_write_to_user(dst, len);
return (__force __wsum)csum;
return csum;
}
EXPORT_SYMBOL(csum_and_copy_to_user);