|
@@ -235,9 +235,8 @@ static bool is_el1_instruction_abort(unsigned int esr)
|
|
return ESR_ELx_EC(esr) == ESR_ELx_EC_IABT_CUR;
|
|
return ESR_ELx_EC(esr) == ESR_ELx_EC_IABT_CUR;
|
|
}
|
|
}
|
|
|
|
|
|
-static inline bool is_el1_permission_fault(unsigned int esr,
|
|
|
|
- struct pt_regs *regs,
|
|
|
|
- unsigned long addr)
|
|
|
|
|
|
+static inline bool is_el1_permission_fault(unsigned long addr, unsigned int esr,
|
|
|
|
+ struct pt_regs *regs)
|
|
{
|
|
{
|
|
unsigned int ec = ESR_ELx_EC(esr);
|
|
unsigned int ec = ESR_ELx_EC(esr);
|
|
unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE;
|
|
unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE;
|
|
@@ -283,7 +282,7 @@ static void __do_kernel_fault(unsigned long addr, unsigned int esr,
|
|
if (!is_el1_instruction_abort(esr) && fixup_exception(regs))
|
|
if (!is_el1_instruction_abort(esr) && fixup_exception(regs))
|
|
return;
|
|
return;
|
|
|
|
|
|
- if (is_el1_permission_fault(esr, regs, addr)) {
|
|
|
|
|
|
+ if (is_el1_permission_fault(addr, esr, regs)) {
|
|
if (esr & ESR_ELx_WNR)
|
|
if (esr & ESR_ELx_WNR)
|
|
msg = "write to read-only memory";
|
|
msg = "write to read-only memory";
|
|
else
|
|
else
|
|
@@ -454,7 +453,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
|
|
mm_flags |= FAULT_FLAG_WRITE;
|
|
mm_flags |= FAULT_FLAG_WRITE;
|
|
}
|
|
}
|
|
|
|
|
|
- if (addr < TASK_SIZE && is_el1_permission_fault(esr, regs, addr)) {
|
|
|
|
|
|
+ if (addr < TASK_SIZE && is_el1_permission_fault(addr, esr, regs)) {
|
|
/* regs->orig_addr_limit may be 0 if we entered from EL0 */
|
|
/* regs->orig_addr_limit may be 0 if we entered from EL0 */
|
|
if (regs->orig_addr_limit == KERNEL_DS)
|
|
if (regs->orig_addr_limit == KERNEL_DS)
|
|
die_kernel_fault("access to user memory with fs=KERNEL_DS",
|
|
die_kernel_fault("access to user memory with fs=KERNEL_DS",
|