shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-26 04:20:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/32s: Remove capability to disable KUEP at boottime

Browse Source 
[ Upstream commit df415cd758 ]

Disabling KUEP at boottime makes things unnecessarily complex.

Still allow disabling KUEP at build time, but when it's built-in
it is always there.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/96f583f82423a29a4205c60b9721079111b35567.1634627931.git.christophe.leroy@csgroup.eu
Stable-dep-of: f0eee815ba ("powerpc/47x: Fix 47x syscall return crash")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe Leroy
2021-10-19 09:29:16 +02:00
committed by Greg Kroah-Hartman
parent fcb3f09e81
commit d00f4ae3ac
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/include/asm/book3s/32/kup.h
View File

@@ -12,7 +12,6 @@
#include <linux/jump_label.h>
extern struct static_key_false disable_kuap_key;
extern struct static_key_false disable_kuep_key;
static __always_inline bool kuap_is_disabled(void)
{
@@ -21,7 +20,7 @@ static __always_inline bool kuap_is_disabled(void)
static __always_inline bool kuep_is_disabled(void)
{
return !IS_ENABLED(CONFIG_PPC_KUEP) || static_branch_unlikely(&disable_kuep_key);
return !IS_ENABLED(CONFIG_PPC_KUEP);
}
static inline void kuep_lock(void)

10
arch/powerpc/mm/book3s32/kuep.c
View File

@@ -3,18 +3,12 @@
#include <asm/kup.h>
#include <asm/smp.h>
struct static_key_false disable_kuep_key;
void setup_kuep(bool disabled)
{
if (!disabled)
kuep_lock();
kuep_lock();
if (smp_processor_id() != boot_cpuid)
return;
if (disabled)
static_branch_enable(&disable_kuep_key);
else
pr_info("Activating Kernel Userspace Execution Prevention\n");
pr_info("Activating Kernel Userspace Execution Prevention\n");
}