From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
npiggin@gmail.com, msuchanek@suse.de
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v5 01/22] powerpc/32s: Add missing call to kuep_lock on syscall entry
Date: Mon, 8 Feb 2021 15:10:20 +0000 (UTC) [thread overview]
Message-ID: <c65e105b63aaf74f91a14f845bc77192350b84a6.1612796617.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1612796617.git.christophe.leroy@csgroup.eu>
Userspace Execution protection and fast syscall entry were implemented
independently from each other and were both merged in kernel 5.2,
leading to syscall entry missing userspace execution protection.
On syscall entry, execution of user space memory must be
locked in the same way as on exception entry.
Fixes: b86fb88855ea ("powerpc/32: implement fast entry for syscalls on non BOOKE")
Cc: stable@vger.kernel.org
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/kernel/entry_32.S | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index b102b40c4988..b1e36602c013 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -351,6 +351,9 @@ trace_syscall_entry_irq_off:
.globl transfer_to_syscall
transfer_to_syscall:
+#ifdef CONFIG_PPC_BOOK3S_32
+ kuep_lock r11, r12
+#endif
#ifdef CONFIG_TRACE_IRQFLAGS
andi. r12,r9,MSR_EE
beq- trace_syscall_entry_irq_off
--
2.25.0
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
npiggin@gmail.com, msuchanek@suse.de
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 01/22] powerpc/32s: Add missing call to kuep_lock on syscall entry
Date: Mon, 8 Feb 2021 15:10:20 +0000 (UTC) [thread overview]
Message-ID: <c65e105b63aaf74f91a14f845bc77192350b84a6.1612796617.git.christophe.leroy@csgroup.eu> (raw)
In-Reply-To: <cover.1612796617.git.christophe.leroy@csgroup.eu>
Userspace Execution protection and fast syscall entry were implemented
independently from each other and were both merged in kernel 5.2,
leading to syscall entry missing userspace execution protection.
On syscall entry, execution of user space memory must be
locked in the same way as on exception entry.
Fixes: b86fb88855ea ("powerpc/32: implement fast entry for syscalls on non BOOKE")
Cc: stable@vger.kernel.org
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
arch/powerpc/kernel/entry_32.S | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index b102b40c4988..b1e36602c013 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -351,6 +351,9 @@ trace_syscall_entry_irq_off:
.globl transfer_to_syscall
transfer_to_syscall:
+#ifdef CONFIG_PPC_BOOK3S_32
+ kuep_lock r11, r12
+#endif
#ifdef CONFIG_TRACE_IRQFLAGS
andi. r12,r9,MSR_EE
beq- trace_syscall_entry_irq_off
--
2.25.0
next prev parent reply other threads:[~2021-02-08 16:16 UTC|newest]
Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 15:10 [PATCH v5 00/22] powerpc/32: Implement C syscall entry/exit Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy [this message]
2021-02-08 15:10 ` [PATCH v5 01/22] powerpc/32s: Add missing call to kuep_lock on syscall entry Christophe Leroy
2021-02-08 15:10 ` [PATCH v5 02/22] powerpc/32: Always enable data translation " Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-08 15:10 ` [PATCH v5 03/22] powerpc/32: On syscall entry, enable instruction translation at the same time as data Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-08 15:10 ` [PATCH v5 04/22] powerpc/32: Reorder instructions to avoid using CTR in syscall entry Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-08 15:10 ` [PATCH v5 05/22] powerpc/irq: Add helper to set regs->softe Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 1:11 ` Nicholas Piggin
2021-02-09 1:11 ` Nicholas Piggin
2021-02-09 5:57 ` Christophe Leroy
2021-02-09 5:57 ` Christophe Leroy
2021-02-09 7:47 ` Nicholas Piggin
2021-02-09 7:47 ` Nicholas Piggin
2021-02-09 6:18 ` Christophe Leroy
2021-02-09 6:18 ` Christophe Leroy
2021-02-09 7:49 ` Nicholas Piggin
2021-02-09 7:49 ` Nicholas Piggin
2021-03-05 8:54 ` Christophe Leroy
2021-03-05 8:54 ` Christophe Leroy
2021-03-08 8:47 ` Nicholas Piggin
2021-03-08 8:47 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 06/22] powerpc/irq: Rework helpers that manipulate MSR[EE/RI] Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 1:14 ` Nicholas Piggin
2021-02-09 1:14 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 07/22] powerpc/irq: Add stub irq_soft_mask_return() for PPC32 Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 1:19 ` Nicholas Piggin
2021-02-09 1:19 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 08/22] powerpc/syscall: Rename syscall_64.c into interrupt.c Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 1:19 ` Nicholas Piggin
2021-02-09 1:19 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 09/22] powerpc/syscall: Make interrupt.c buildable on PPC32 Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 1:27 ` Nicholas Piggin
2021-02-09 1:27 ` Nicholas Piggin
2021-02-09 6:02 ` Christophe Leroy
2021-02-09 6:02 ` Christophe Leroy
2021-02-09 7:50 ` Nicholas Piggin
2021-02-09 7:50 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 10/22] powerpc/syscall: Use is_compat_task() Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 1:29 ` Nicholas Piggin
2021-02-09 1:29 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 11/22] powerpc/syscall: Save r3 in regs->orig_r3 Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 1:29 ` Nicholas Piggin
2021-02-09 1:29 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 12/22] powerpc/syscall: Change condition to check MSR_RI Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 1:36 ` Nicholas Piggin
2021-02-09 1:36 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 13/22] powerpc/32: Always save non volatile GPRs at syscall entry Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-08 15:10 ` [PATCH v5 14/22] powerpc/syscall: implement system call entry/exit logic in C for PPC32 Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-08 15:10 ` [PATCH v5 15/22] powerpc/32: Remove verification of MSR_PR on syscall in the ASM entry Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-08 15:10 ` [PATCH v5 16/22] powerpc/syscall: Avoid stack frame in likely part of system_call_exception() Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 1:55 ` Nicholas Piggin
2021-02-09 1:55 ` Nicholas Piggin
2021-02-09 16:13 ` Christophe Leroy
2021-02-09 16:13 ` Christophe Leroy
2021-02-10 1:56 ` Nicholas Piggin
2021-02-10 1:56 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 17/22] powerpc/syscall: Do not check unsupported scv vector on PPC32 Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 2:00 ` Nicholas Piggin
2021-02-09 2:00 ` Nicholas Piggin
2021-02-09 6:13 ` Christophe Leroy
2021-02-09 6:13 ` Christophe Leroy
2021-02-09 7:56 ` Nicholas Piggin
2021-02-09 7:56 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 18/22] powerpc/syscall: Remove FULL_REGS verification in system_call_exception Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 2:02 ` Nicholas Piggin
2021-02-09 2:02 ` Nicholas Piggin
2021-02-09 14:31 ` Christophe Leroy
2021-02-09 14:31 ` Christophe Leroy
2021-02-10 1:57 ` Nicholas Piggin
2021-02-10 1:57 ` Nicholas Piggin
2021-02-08 15:10 ` [PATCH v5 19/22] powerpc/syscall: Optimise checks in beginning of system_call_exception() Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 2:06 ` Nicholas Piggin
2021-02-09 2:06 ` Nicholas Piggin
2021-02-09 14:32 ` Christophe Leroy
2021-02-09 14:32 ` Christophe Leroy
2021-02-08 15:10 ` [PATCH v5 20/22] powerpc/syscall: Avoid storing 'current' in another pointer Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 2:36 ` Nicholas Piggin
2021-02-09 2:36 ` Nicholas Piggin
2021-02-09 13:50 ` Segher Boessenkool
2021-02-09 13:50 ` Segher Boessenkool
2021-02-09 14:31 ` David Laight
2021-02-09 14:31 ` David Laight
2021-02-09 17:03 ` Christophe Leroy
2021-02-09 17:03 ` Christophe Leroy
2021-02-09 17:16 ` David Laight
2021-02-09 17:16 ` David Laight
2021-02-10 2:00 ` Nicholas Piggin
2021-02-10 2:00 ` Nicholas Piggin
2021-02-10 8:45 ` Christophe Leroy
2021-02-10 8:45 ` Christophe Leroy
2021-02-08 15:10 ` [PATCH v5 21/22] powerpc/32: Remove the counter in global_dbcr0 Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-08 15:10 ` [PATCH v5 22/22] powerpc/32: Handle bookE debugging in C in syscall entry/exit Christophe Leroy
2021-02-08 15:10 ` Christophe Leroy
2021-02-09 1:03 ` [PATCH v5 00/22] powerpc/32: Implement C " Nicholas Piggin
2021-02-09 1:03 ` Nicholas Piggin
2021-02-12 0:19 ` Michael Ellerman
2021-02-12 0:19 ` Michael Ellerman
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=c65e105b63aaf74f91a14f845bc77192350b84a6.1612796617.git.christophe.leroy@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=msuchanek@suse.de \
--cc=npiggin@gmail.com \
--cc=paulus@samba.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.