|
@@ -269,13 +269,19 @@ out:
|
|
|
return fault;
|
|
|
}
|
|
|
|
|
|
-static inline bool is_permission_fault(unsigned int esr)
|
|
|
+static inline bool is_permission_fault(unsigned int esr, struct pt_regs *regs)
|
|
|
{
|
|
|
unsigned int ec = ESR_ELx_EC(esr);
|
|
|
unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE;
|
|
|
|
|
|
- return (ec == ESR_ELx_EC_DABT_CUR && fsc_type == ESR_ELx_FSC_PERM) ||
|
|
|
- (ec == ESR_ELx_EC_IABT_CUR && fsc_type == ESR_ELx_FSC_PERM);
|
|
|
+ if (ec != ESR_ELx_EC_DABT_CUR && ec != ESR_ELx_EC_IABT_CUR)
|
|
|
+ return false;
|
|
|
+
|
|
|
+ if (system_uses_ttbr0_pan())
|
|
|
+ return fsc_type == ESR_ELx_FSC_FAULT &&
|
|
|
+ (regs->pstate & PSR_PAN_BIT);
|
|
|
+ else
|
|
|
+ return fsc_type == ESR_ELx_FSC_PERM;
|
|
|
}
|
|
|
|
|
|
static bool is_el0_instruction_abort(unsigned int esr)
|
|
@@ -315,7 +321,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
|
|
|
mm_flags |= FAULT_FLAG_WRITE;
|
|
|
}
|
|
|
|
|
|
- if (is_permission_fault(esr) && (addr < USER_DS)) {
|
|
|
+ if (addr < USER_DS && is_permission_fault(esr, regs)) {
|
|
|
/* regs->orig_addr_limit may be 0 if we entered from EL0 */
|
|
|
if (regs->orig_addr_limit == KERNEL_DS)
|
|
|
die("Accessing user space memory with fs=KERNEL_DS", regs, esr);
|