Commit 969e61ba authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas
Browse files

arm64: make is_permission_fault() name clearer 



The naming of is_permission_fault() makes it sound like it should return
true for permission faults from EL0, but by design, it only does so for
faults from EL1.

Let's make this clear by dropping el1 in the name, as we do for
is_el1_instruction_abort().

Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 7bd99b40

arch/arm64/mm/fault.c

+5 −4
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ static bool is_el1_instruction_abort(unsigned int esr) 
	return ESR_ELx_EC(esr) == ESR_ELx_EC_IABT_CUR;

}



static inline bool is_permission_fault(unsigned int esr, struct pt_regs *regs,

static inline bool is_el1_permission_fault(unsigned int esr,

					   struct pt_regs *regs,

					   unsigned long addr)

{

	unsigned int ec       = ESR_ELx_EC(esr);
@@ -268,7 +269,7 @@ static void __do_kernel_fault(unsigned long addr, unsigned int esr, 


	bust_spinlocks(1);



	if (is_permission_fault(esr, regs, addr)) {

	if (is_el1_permission_fault(esr, regs, addr)) {

		if (esr & ESR_ELx_WNR)

			msg = "write to read-only memory";

		else
@@ -395,7 +396,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, 
		mm_flags |= FAULT_FLAG_WRITE;

	}



	if (addr < TASK_SIZE && is_permission_fault(esr, regs, addr)) {

	if (addr < TASK_SIZE && is_el1_permission_fault(esr, regs, addr)) {

		/* 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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE