Commit 164dc6ce authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

powerpc/net: Switch csum_and_copy_{to/from}_user to user_access block

Use user_access_begin() instead of the
might_sleep/access_ok/allow_access sequence.
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/2dee286d2d6dc9a27d99e31ac564bad4fae2cb49.1615398498.git.christophe.leroy@csgroup.eu
parent e63ceebd
...@@ -16,16 +16,12 @@ __wsum csum_and_copy_from_user(const void __user *src, void *dst, ...@@ -16,16 +16,12 @@ __wsum csum_and_copy_from_user(const void __user *src, void *dst,
{ {
__wsum csum; __wsum csum;
might_sleep(); if (unlikely(!user_read_access_begin(src, len)))
if (unlikely(!access_ok(src, len)))
return 0; return 0;
allow_read_from_user(src, len);
csum = csum_partial_copy_generic((void __force *)src, dst, len); csum = csum_partial_copy_generic((void __force *)src, dst, len);
prevent_read_from_user(src, len); user_read_access_end();
return csum; return csum;
} }
EXPORT_SYMBOL(csum_and_copy_from_user); EXPORT_SYMBOL(csum_and_copy_from_user);
...@@ -34,15 +30,12 @@ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len) ...@@ -34,15 +30,12 @@ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len)
{ {
__wsum csum; __wsum csum;
might_sleep(); if (unlikely(!user_write_access_begin(dst, len)))
if (unlikely(!access_ok(dst, len)))
return 0; return 0;
allow_write_to_user(dst, len);
csum = csum_partial_copy_generic(src, (void __force *)dst, len); csum = csum_partial_copy_generic(src, (void __force *)dst, len);
prevent_write_to_user(dst, len); user_write_access_end();
return csum; return csum;
} }
EXPORT_SYMBOL(csum_and_copy_to_user); EXPORT_SYMBOL(csum_and_copy_to_user);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment