Skip to content

Commit b61b82f

Browse files
Sangmoon Kimctmarinas
authored andcommitted
arm64: pass ESR_ELx to die() of cfi_handler
Commit 0f2cb92 ("arm64: consistently pass ESR_ELx to die()") caused all callers to pass the ESR_ELx value to die(). For consistency, this patch also adds esr to die() call of cfi_handler. Also, when CFI error occurs, die handlers can use ESR_ELx value. Signed-off-by: Sangmoon Kim <[email protected]> Acked-by: Mark Rutland <[email protected]> Reviewed-by: Mark Brown <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 0269680 commit b61b82f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm64/kernel/traps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ static int cfi_handler(struct pt_regs *regs, unsigned long esr)
990990

991991
switch (report_cfi_failure(regs, regs->pc, &target, type)) {
992992
case BUG_TRAP_TYPE_BUG:
993-
die("Oops - CFI", regs, 0);
993+
die("Oops - CFI", regs, esr);
994994
break;
995995

996996
case BUG_TRAP_TYPE_WARN:

0 commit comments

Comments
 (0)