diff options
| author | Sangmoon Kim <sangmoon.kim@samsung.com> | 2023-02-20 16:34:41 +0900 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2023-02-22 16:51:26 +0000 |
| commit | b61b82f81e095fe265b0614045d17b08e6ee5c72 (patch) | |
| tree | de5680f97fb4057e8b88bccdb111f4233d138606 /arch | |
| parent | 0269680e5eb88f6223c53a8b3138cbfa60ba7657 (diff) | |
| download | linux-stable-b61b82f81e095fe265b0614045d17b08e6ee5c72.tar.gz linux-stable-b61b82f81e095fe265b0614045d17b08e6ee5c72.tar.bz2 linux-stable-b61b82f81e095fe265b0614045d17b08e6ee5c72.zip | |
arm64: pass ESR_ELx to die() of cfi_handler
Commit 0f2cb928a154 ("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 <sangmoon.kim@samsung.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230220073441.2753-1-sangmoon.kim@samsung.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 0ccc063daccb..4a623e2e982b 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -990,7 +990,7 @@ static int cfi_handler(struct pt_regs *regs, unsigned long esr) switch (report_cfi_failure(regs, regs->pc, &target, type)) { case BUG_TRAP_TYPE_BUG: - die("Oops - CFI", regs, 0); + die("Oops - CFI", regs, esr); break; case BUG_TRAP_TYPE_WARN: |