From e1b3a9f1895af908bc56296c1d1fcb349c2b88b5 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Wed, 16 Oct 2019 11:42:11 -0700 Subject: [PATCH] ANDROID: x86/extable: Do not mark exception callback as CFI The exception table entries are constructed out of a relative offset and point to the actual function, not the CFI table entry. For now, just mark the caller as not checking CFI. The failure is most visible at boot with CONFIG_DEBUG_RODATA_TEST=y. Bug: 145297900 Change-Id: Ia5e9da358c41b8e8a08e253926ed31775817a4e6 Signed-off-by: Kees Cook Signed-off-by: Sami Tolvanen --- arch/x86/mm/extable.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index 4d75bc656f97..3cacb49a54e8 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c @@ -199,6 +199,7 @@ __visible bool ex_has_fault_handler(unsigned long ip) return handler == ex_handler_fault; } +__nocfi int fixup_exception(struct pt_regs *regs, int trapnr, unsigned long error_code, unsigned long fault_addr) {