From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Russell Currey <ruscur@russell.cc>, linuxppc-dev@lists.ozlabs.org
Cc: mikey@neuling.org, kernel-hardening@lists.openwall.com,
npiggin@gmail.com
Subject: Re: [PATCH v2 2/3] powerpc/lib: Refactor __patch_instruction() to use __put_user_asm()
Date: Mon, 17 Dec 2018 08:09:26 +0100 [thread overview]
Message-ID: <3b213170-9b93-cb71-b0c2-220ea31dbdea@c-s.fr> (raw)
In-Reply-To: <20181210070044.27503-3-ruscur@russell.cc>
Hi Russel,
Le 10/12/2018 à 08:00, Russell Currey a écrit :
> __patch_instruction() is called in early boot, and uses
> __put_user_size(), which includes the locks and unlocks for KUAP,
> which could either be called too early, or in the Radix case, forced to
> use "early_" versions of functions just to safely handle this one case.
Looking at x86, I see that __put_user_size() doesn't includes the locks.
The lock/unlock is do by callers. I'll do the same.
>
> __put_user_asm() does not do this, and thus is safe to use both in early
> boot, and later on since in this case it should only ever be touching
> kernel memory.
>
> __patch_instruction() was previously refactored to use __put_user_size()
> in order to be able to return -EFAULT, which would allow the kernel to
> patch instructions in userspace, which should never happen. This has
> the functional change of causing faults on userspace addresses if KUAP
> is turned on, which should never happen in practice.
>
> A future enhancement could be to double check the patch address is
> definitely allowed to be tampered with by the kernel.
This makes me realise that we are calling lock_user_access() with kernel
addresses. That most likely breaks protection on kernel addresses for
book3s/32. I'll have to work around it.
Another thing I realised also is that get_user() at least is called in
some exceptions/trap handlers. Which means it can be called nested with
an ongoing user access. It means that get_paca()->user_access_allowed
might be modified during those exceptions/traps.
Christophe
>
> Signed-off-by: Russell Currey <ruscur@russell.cc>
> ---
> arch/powerpc/lib/code-patching.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
> index 89502cbccb1b..15e8c6339960 100644
> --- a/arch/powerpc/lib/code-patching.c
> +++ b/arch/powerpc/lib/code-patching.c
> @@ -26,9 +26,9 @@
> static int __patch_instruction(unsigned int *exec_addr, unsigned int instr,
> unsigned int *patch_addr)
> {
> - int err;
> + int err = 0;
>
> - __put_user_size(instr, patch_addr, 4, err);
> + __put_user_asm(instr, patch_addr, err, "stw");
> if (err)
> return err;
>
>
next prev parent reply other threads:[~2018-12-17 7:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-10 7:00 [PATCH v2 0/3] [PATCH v2 0/3] Kernel Userspace Protection for Radix MMU Russell Currey
2018-12-10 7:00 ` [PATCH v2 1/3] powerpc/mm/radix: Use KUEP API " Russell Currey
2018-12-10 7:00 ` [PATCH v2 2/3] powerpc/lib: Refactor __patch_instruction() to use __put_user_asm() Russell Currey
2018-12-17 7:09 ` Christophe Leroy [this message]
2019-01-25 11:45 ` Christophe Leroy
2019-02-20 11:57 ` Russell Currey
2018-12-10 7:00 ` [PATCH v2 3/3] powerpc/64s: Implement KUAP for Radix MMU 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=3b213170-9b93-cb71-b0c2-220ea31dbdea@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=kernel-hardening@lists.openwall.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.org \
--cc=npiggin@gmail.com \
--cc=ruscur@russell.cc \
/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).