Commit d683a856 authored by Mostafa Saleh's avatar Mostafa Saleh Committed by Marc Zyngier
Browse files

ubsan: Remove regs from report_ubsan_failure() 



report_ubsan_failure() doesn't use argument regs, and soon it will
be called from the hypervisor context were regs are not available.
So, remove the unused argument.

Signed-off-by: default avatarMostafa Saleh <smostafa@google.com>
Acked-by: default avatarKees Cook <kees@kernel.org>
Link: https://lore.kernel.org/r/20250430162713.1997569-3-smostafa@google.com


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent dc1fd37a

arch/arm64/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ static struct break_hook kasan_break_hook = { 
#ifdef CONFIG_UBSAN_TRAP

static int ubsan_handler(struct pt_regs *regs, unsigned long esr)

{

	die(report_ubsan_failure(regs, esr & UBSAN_BRK_MASK), regs, esr);

	die(report_ubsan_failure(esr & UBSAN_BRK_MASK), regs, esr);

	return DBG_HOOK_HANDLED;

}

arch/x86/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static noinstr bool handle_bug(struct pt_regs *regs) 
	case BUG_UD1_UBSAN:

		if (IS_ENABLED(CONFIG_UBSAN_TRAP)) {

			pr_crit("%s at %pS\n",

				report_ubsan_failure(regs, ud_imm),

				report_ubsan_failure(ud_imm),

				(void *)regs->ip);

		}

		break;

include/linux/ubsan.h

+2 −2
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
#define _LINUX_UBSAN_H



#ifdef CONFIG_UBSAN_TRAP

const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type);

const char *report_ubsan_failure(u32 check_type);

#else

static inline const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type)

static inline const char *report_ubsan_failure(u32 check_type)

{

	return NULL;

}

lib/ubsan.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * The mappings of struct SanitizerKind (the -fsanitize=xxx args) to

 * enum SanitizerHandler (the traps) in Clang is in clang/lib/CodeGen/.

 */

const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type)

const char *report_ubsan_failure(u32 check_type)

{

	switch (check_type) {

#ifdef CONFIG_UBSAN_BOUNDS