Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a084fc30 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Amit Pundir
Browse files

Revert "FROMLIST: arm64: Handle faults caused by inadvertent user access with PAN enabled" 



This reverts commit 7932057e.

Bug: 31432001
Change-Id: Ie7ccaefe496e86a238ddc1301fbc404778c83062
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 97c1bd93

arch/arm64/mm/fault.c

+8 −14
Original line number Diff line number Diff line
@@ -197,19 +197,13 @@ out: 
	return fault;

}



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

static inline bool is_permission_fault(unsigned int esr)

{

	unsigned int ec       = ESR_ELx_EC(esr);

	unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE;



	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;

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

}



static bool is_el0_instruction_abort(unsigned int esr)
@@ -250,7 +244,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, 
		mm_flags |= FAULT_FLAG_WRITE;

	}



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

	if (is_permission_fault(esr) && (addr < USER_DS)) {

		/* 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);
@@ -435,10 +429,10 @@ static const struct fault_info { 
	{ do_bad,		SIGBUS,  0,		"asynchronous external abort"	},

	{ do_bad,		SIGBUS,  0,		"unknown 18"			},

	{ do_bad,		SIGBUS,  0,		"unknown 19"			},

	{ do_bad,		SIGBUS,  0,		"synchronous external abort (translation table walk)" },

	{ do_bad,		SIGBUS,  0,		"synchronous external abort (translation table walk)" },

	{ do_bad,		SIGBUS,  0,		"synchronous external abort (translation table walk)" },

	{ do_bad,		SIGBUS,  0,		"synchronous external abort (translation table walk)" },

	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },

	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },

	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },

	{ do_bad,		SIGBUS,  0,		"synchronous abort (translation table walk)" },

	{ do_bad,		SIGBUS,  0,		"synchronous parity error"	},

	{ do_bad,		SIGBUS,  0,		"asynchronous parity error"	},

	{ do_bad,		SIGBUS,  0,		"unknown 26"			},