From: Russell Currey <ruscur@russell.cc>
To: linuxppc-dev@lists.ozlabs.org
Cc: mikey@neuling.org, Russell Currey <ruscur@russell.cc>
Subject: [PATCH 3/5] powerpc/lib: checksum KHRAP support
Date: Wed, 17 Oct 2018 17:44:21 +1100 [thread overview]
Message-ID: <20181017064422.26119-3-ruscur@russell.cc> (raw)
In-Reply-To: <20181017064422.26119-1-ruscur@russell.cc>
Wrap the checksumming code in KHRAP locks and unlocks.
Signed-off-by: Russell Currey <ruscur@russell.cc>
---
arch/powerpc/lib/checksum_wrappers.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/lib/checksum_wrappers.c b/arch/powerpc/lib/checksum_wrappers.c
index a0cb63fb76a1..695460a29c9f 100644
--- a/arch/powerpc/lib/checksum_wrappers.c
+++ b/arch/powerpc/lib/checksum_wrappers.c
@@ -26,7 +26,7 @@
__wsum csum_and_copy_from_user(const void __user *src, void *dst,
int len, __wsum sum, int *err_ptr)
{
- unsigned int csum;
+ unsigned int csum, amr = unlock_user_access();
might_sleep();
@@ -60,6 +60,7 @@ __wsum csum_and_copy_from_user(const void __user *src, void *dst,
}
out:
+ lock_user_access(amr);
return (__force __wsum)csum;
}
EXPORT_SYMBOL(csum_and_copy_from_user);
@@ -67,7 +68,7 @@ EXPORT_SYMBOL(csum_and_copy_from_user);
__wsum csum_and_copy_to_user(const void *src, void __user *dst, int len,
__wsum sum, int *err_ptr)
{
- unsigned int csum;
+ unsigned int csum, amr = unlock_user_access();
might_sleep();
@@ -97,6 +98,7 @@ __wsum csum_and_copy_to_user(const void *src, void __user *dst, int len,
}
out:
+ lock_user_access(amr);
return (__force __wsum)csum;
}
EXPORT_SYMBOL(csum_and_copy_to_user);
--
2.19.1
next prev parent reply other threads:[~2018-10-17 7:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 6:44 [PATCH 1/5] powerpc/64s: Kernel Hypervisor Restricted Access Prevention Russell Currey
2018-10-17 6:44 ` [PATCH 2/5] powerpc/futex: KHRAP support for futex ops Russell Currey
2018-10-17 6:44 ` Russell Currey [this message]
2018-10-17 6:44 ` [PATCH 4/5] powerpc/64s: Disable KHRAP with nosmap option Russell Currey
2018-10-17 6:44 ` [PATCH 5/5] powerpc/64s: Document that PPC supports nosmap Russell Currey
2018-10-17 10:07 ` [PATCH 1/5] powerpc/64s: Kernel Hypervisor Restricted Access Prevention kbuild test robot
2018-10-17 11:30 ` Michael Ellerman
2018-10-18 2:03 ` Russell Currey
2018-10-17 12:59 ` Nicholas Piggin
2018-10-18 2:02 ` Russell Currey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181017064422.26119-3-ruscur@russell.cc \
--to=ruscur@russell.cc \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).