Commit 90818e47 authored by Mark Rutland's avatar Mark Rutland Committed by Jinjie Ruan
Browse files

arm64: die(): pass 'err' as long 

stable inclusion
from stable-v5.10.199
commit 004bdab6edc70aa5bd0e61573bacaee7857c5790
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I65RG3?from=project-issue
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=004bdab6edc70aa5bd0e61573bacaee7857c5790



-------------------------------------------------

commit 18906ff9 upstream.

Recently, we reworked a lot of code to consistentlt pass ESR_ELx as a
64-bit quantity. However, we missed that this can be passed into die()
and __die() as the 'err' parameter where it is truncated to a 32-bit
int.

As notify_die() already takes 'err' as a long, this patch changes die()
and __die() to also take 'err' as a long, ensuring that the full value
of ESR_ELx is retained.

At the same time, die() is updated to consistently log 'err' as a
zero-padded 64-bit quantity.

Subsequent patches will pass the ESR_ELx value to die() for a number of
exceptions.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Cc: Alexandru Elisei <alexandru.elisei@arm.com>
Cc: Amit Daniel Kachhap <amit.kachhap@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20220913101732.3925290-3-mark.rutland@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
parent 36a9ff82

arch/arm64/include/asm/system_misc.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


struct pt_regs;



void die(const char *msg, struct pt_regs *regs, int err);

void die(const char *msg, struct pt_regs *regs, long err);



struct siginfo;

void arm64_notify_die(const char *str, struct pt_regs *regs,

arch/arm64/kernel/traps.c

+3 −3
Original line number Diff line number Diff line
@@ -91,12 +91,12 @@ static void dump_kernel_instr(const char *lvl, struct pt_regs *regs) 


#define S_SMP " SMP"



static int __die(const char *str, int err, struct pt_regs *regs)

static int __die(const char *str, long err, struct pt_regs *regs)

{

	static int die_counter;

	int ret;



	pr_emerg("Internal error: %s: %x [#%d]" S_PREEMPT S_SMP "\n",

	pr_emerg("Internal error: %s: %016lx [#%d]" S_PREEMPT S_SMP "\n",

		 str, err, ++die_counter);



	/* trap and error numbers are mostly meaningless on ARM */
@@ -117,7 +117,7 @@ static DEFINE_RAW_SPINLOCK(die_lock); 
/*

 * This function is protected against re-entrancy.

 */

void die(const char *str, struct pt_regs *regs, int err)

void die(const char *str, struct pt_regs *regs, long err)

{

	int ret;

	unsigned long flags;