diff options
author | Christophe Leroy <christophe.leroy@c-s.fr> | 2019-04-18 02:51:19 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-04-21 09:05:56 -0400 |
commit | 0fb1c25ab523614b056ace11be67aac8f8ccabb1 (patch) | |
tree | 0f458e2ca41b6e94626f1d7bc41c4557e42a44ec /arch/powerpc/mm/fault.c | |
parent | 69795cabe4cfe5122438d50010ad5310c113a013 (diff) |
powerpc: Add skeleton for Kernel Userspace Execution Prevention
This patch adds a skeleton for Kernel Userspace Execution Prevention.
Then subarches implementing it have to define CONFIG_PPC_HAVE_KUEP
and provide setup_kuep() function.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
[mpe: Don't split strings, use pr_crit_ratelimited()]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm/fault.c')
-rw-r--r-- | arch/powerpc/mm/fault.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 887f11bcf330..3384354abc1d 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
@@ -229,11 +229,10 @@ static bool bad_kernel_fault(bool is_exec, unsigned long error_code, | |||
229 | /* NX faults set DSISR_PROTFAULT on the 8xx, DSISR_NOEXEC_OR_G on others */ | 229 | /* NX faults set DSISR_PROTFAULT on the 8xx, DSISR_NOEXEC_OR_G on others */ |
230 | if (is_exec && (error_code & (DSISR_NOEXEC_OR_G | DSISR_KEYFAULT | | 230 | if (is_exec && (error_code & (DSISR_NOEXEC_OR_G | DSISR_KEYFAULT | |
231 | DSISR_PROTFAULT))) { | 231 | DSISR_PROTFAULT))) { |
232 | printk_ratelimited(KERN_CRIT "kernel tried to execute" | 232 | pr_crit_ratelimited("kernel tried to execute %s page (%lx) - exploit attempt? (uid: %d)\n", |
233 | " exec-protected page (%lx) -" | 233 | address >= TASK_SIZE ? "exec-protected" : "user", |
234 | "exploit attempt? (uid: %d)\n", | 234 | address, |
235 | address, from_kuid(&init_user_ns, | 235 | from_kuid(&init_user_ns, current_uid())); |
236 | current_uid())); | ||
237 | } | 236 | } |
238 | return is_exec || (address >= TASK_SIZE); | 237 | return is_exec || (address >= TASK_SIZE); |
239 | } | 238 | } |