Commit 50d2f104 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

powerpc/32s: Allow disabling KUEP at boot time

PPC64 uses MMU features to enable/disable KUEP at boot time.
But feature fixups are applied way too early on PPC32.

Now that all KUEP related actions are in C following the
conversion of KUEP initial setup and context switch in C,
static branches can be used to enable/disable KUEP.
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/7745a2c3a08ec46302920a3f48d1cb9b5469dbbb.1622708530.git.christophe.leroy@csgroup.eu
parent 86f46f34
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/jump_label.h>
extern struct static_key_false disable_kuep_key;
static __always_inline bool kuap_is_disabled(void) static __always_inline bool kuap_is_disabled(void)
{ {
return !IS_ENABLED(CONFIG_PPC_KUAP); return !IS_ENABLED(CONFIG_PPC_KUAP);
...@@ -14,7 +18,7 @@ static __always_inline bool kuap_is_disabled(void) ...@@ -14,7 +18,7 @@ static __always_inline bool kuap_is_disabled(void)
static __always_inline bool kuep_is_disabled(void) static __always_inline bool kuep_is_disabled(void)
{ {
return !IS_ENABLED(CONFIG_PPC_KUEP); return !IS_ENABLED(CONFIG_PPC_KUEP) || static_branch_unlikely(&disable_kuep_key);
} }
static inline void kuep_lock(void) static inline void kuep_lock(void)
......
...@@ -3,15 +3,18 @@ ...@@ -3,15 +3,18 @@
#include <asm/kup.h> #include <asm/kup.h>
#include <asm/smp.h> #include <asm/smp.h>
struct static_key_false disable_kuep_key;
void __init setup_kuep(bool disabled) void __init setup_kuep(bool disabled)
{ {
kuep_lock(); if (!disabled)
kuep_lock();
if (smp_processor_id() != boot_cpuid) if (smp_processor_id() != boot_cpuid)
return; return;
pr_info("Activating Kernel Userspace Execution Prevention\n");
if (disabled) if (disabled)
pr_warn("KUEP cannot be disabled yet on 6xx when compiled in\n"); static_branch_enable(&disable_kuep_key);
else
pr_info("Activating Kernel Userspace Execution Prevention\n");
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment