From: christoffer.dall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: Re-enable PAN on uaccess_enable
Date: Mon, 12 Dec 2016 16:06:36 +0100 [thread overview]
Message-ID: <20161212150636.GA7070@cbox> (raw)
In-Reply-To: <1481550626-30956-1-git-send-email-marc.zyngier@arm.com>
On Mon, Dec 12, 2016 at 01:50:26PM +0000, Marc Zyngier wrote:
> Commit 4b65a5db3627 ("arm64: Introduce uaccess_{disable,enable}
> functionality based on TTBR0_EL1") added conditional PAN
> enable/disable. Unfortunately, a typo prevents PAN from being
> re-enabled once it has been disabled.
>
> Restore the PAN functionnality by adding the missing '!'.
>
> Fixes: b65a5db3627 ("arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1")
> Reported-by: Christoffer Dall <christoffer.dall@linaro.org>
> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
> ---
> Christoffer, any chance you could give this a go and let me know
> if that fixes your issues?
Yep, fixes the issue. Thanks!
-Christoffer
>
> arch/arm64/include/asm/uaccess.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
> index 6986f56..d26750c 100644
> --- a/arch/arm64/include/asm/uaccess.h
> +++ b/arch/arm64/include/asm/uaccess.h
> @@ -188,7 +188,7 @@ do { \
>
> #define __uaccess_enable(alt) \
> do { \
> - if (uaccess_ttbr0_enable()) \
> + if (!uaccess_ttbr0_enable()) \
> asm(ALTERNATIVE("nop", SET_PSTATE_PAN(0), alt, \
> CONFIG_ARM64_PAN)); \
> } while (0)
> --
> 2.1.4
>
next prev parent reply other threads:[~2016-12-12 15:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-12 13:50 [PATCH] arm64: Re-enable PAN on uaccess_enable Marc Zyngier
2016-12-12 15:06 ` Christoffer Dall [this message]
2016-12-12 15:14 ` Catalin Marinas
2016-12-12 15:25 ` Marc Zyngier
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=20161212150636.GA7070@cbox \
--to=christoffer.dall@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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).