If a task generates a KUAP fault, even from an acceptable
user access sequence, it is not a simple EFAULT.
Instead of emiting a warning, print a critical message and
kill the task with SIGSEGV.
Signed-off-by: Christophe Leroy <christophe.le...@c-s.fr>
---
arch/powerpc/include/asm/book3s/32/kup.h | 7 +++++--
arch/powerpc/include/asm/book3s/64/kup-radix.h | 14 +++++++++++---
arch/powerpc/include/asm/nohash/32/kup-8xx.h | 8 ++++++--
arch/powerpc/mm/fault.c | 6 +++++-
4 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/32/kup.h
b/arch/powerpc/include/asm/book3s/32/kup.h
index 3c0ba22dc360..63422650cb86 100644
--- a/arch/powerpc/include/asm/book3s/32/kup.h
+++ b/arch/powerpc/include/asm/book3s/32/kup.h
@@ -181,12 +181,15 @@ bad_kuap_fault(struct pt_regs *regs, unsigned long
address, bool is_write)
{
unsigned long begin = regs->kuap & 0xf0000000;
unsigned long end = regs->kuap << 28;
+ bool is_fault = address < begin || address >= end;
if (!is_write)
return false;
- return WARN(address < begin || address >= end,
- "Bug: write fault blocked by segment registers !");
+ if (is_fault)
+ pr_crit("Bug: write fault blocked by segment registers !");
+
+ return is_fault;
}
#endif /* CONFIG_PPC_KUAP */
diff --git a/arch/powerpc/include/asm/book3s/64/kup-radix.h
b/arch/powerpc/include/asm/book3s/64/kup-radix.h
index 3bcef989a35d..41a450d0aa06 100644
--- a/arch/powerpc/include/asm/book3s/64/kup-radix.h
+++ b/arch/powerpc/include/asm/book3s/64/kup-radix.h
@@ -137,9 +137,17 @@ static inline void restore_user_access(unsigned long flags)
static inline bool
bad_kuap_fault(struct pt_regs *regs, unsigned long address, bool is_write)
{
- return WARN(mmu_has_feature(MMU_FTR_RADIX_KUAP) &&
- (regs->kuap & (is_write ? AMR_KUAP_BLOCK_WRITE :
AMR_KUAP_BLOCK_READ)),
- "Bug: %s fault blocked by AMR!", is_write ? "Write" :
"Read");
+ bool is_fault;
+
+ if (!mmu_has_feature(MMU_FTR_RADIX_KUAP))
+ return false;
+
+ is_fault = regs->kuap & (is_write ? AMR_KUAP_BLOCK_WRITE :
AMR_KUAP_BLOCK_READ);
+
+ if (is_fault)
+ pr_crit("Bug: %s fault blocked by AMR!", is_write ? "Write" :
"Read");
+
+ return is_fault;
}
#else /* CONFIG_PPC_KUAP */
static inline void kuap_restore_amr(struct pt_regs *regs)
diff --git a/arch/powerpc/include/asm/nohash/32/kup-8xx.h
b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
index 85ed2390fb99..31419126c2bf 100644
--- a/arch/powerpc/include/asm/nohash/32/kup-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/kup-8xx.h
@@ -63,8 +63,12 @@ static inline void restore_user_access(unsigned long flags)
static inline bool
bad_kuap_fault(struct pt_regs *regs, unsigned long address, bool is_write)
{
- return WARN(!((regs->kuap ^ MD_APG_KUAP) & 0xf0000000),
- "Bug: fault blocked by AP register !");
+ bool is_fault = !((regs->kuap ^ MD_APG_KUAP) & 0xf0000000);
+
+ if (is_fault)
+ pr_crit("Bug: fault blocked by AP register !\n");
+
+ return is_fault;
}
#endif /* !__ASSEMBLY__ */
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 84af6c8eecf7..91b458aa666e 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -233,8 +233,12 @@ static bool bad_kernel_fault(struct pt_regs *regs,
unsigned long error_code,
// Read/write fault in a valid region (the exception table search passed
// above), but blocked by KUAP is bad, it can never succeed.
- if (bad_kuap_fault(regs, address, is_write))
+ if (bad_kuap_fault(regs, address, is_write)) {
+ pr_crit("kernel %s to userspace (%lx) blocked by KUAP\n",
+ is_write ? "write" : "read", address);
+ _exception(SIGSEGV, regs, SEGV_ACCERR, address);
return true;
+ }
// What's left? Kernel fault on user in well defined regions (extable
// matched), and allowed by KUAP in the faulting context.
--
2.25.0
