kevin/linux
1
Fork 0
Code

ubsan: Add awareness of signed integer overflow traps

Browse Source 
On arm64, UBSAN traps can be decoded from the trap instruction. Add the
add, sub, and mul overflow trap codes now that CONFIG_UBSAN_SIGNED_WRAP
exists. Seen under clang 19:

  Internal error: UBSAN: unrecognized failure code: 00000000f2005515 [#1] PREEMPT SMP

Reported-by: Nathan Chancellor <nathan@kernel.org>
Closes: https://lore.kernel.org/lkml/20240411-fix-ubsan-in-hardening-config-v1-0-e0177c80ffaa@kernel.org
Fixes: 557f8c582a ("ubsan: Reintroduce signed overflow sanitizer")
Tested-by: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20240415182832.work.932-kees@kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
Kees Cook 2024-04-15 11:28:35 -07:00
parent 7fcb91d94e
commit f4626c12e4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/ubsan.c
View File

@ -44,9 +44,10 @@ const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type)
case ubsan_shift_out_of_bounds: case ubsan_shift_out_of_bounds:
return "UBSAN: shift out of bounds"; return "UBSAN: shift out of bounds";
#endif #endif
#ifdef CONFIG_UBSAN_DIV_ZERO #if defined(CONFIG_UBSAN_DIV_ZERO) || defined(CONFIG_UBSAN_SIGNED_WRAP)
/* /*
* SanitizerKind::IntegerDivideByZero emits * SanitizerKind::IntegerDivideByZero and
* SanitizerKind::SignedIntegerOverflow emit
* SanitizerHandler::DivremOverflow. * SanitizerHandler::DivremOverflow.
*/ */
case ubsan_divrem_overflow: case ubsan_divrem_overflow:
@ -77,6 +78,19 @@ const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type)
return "UBSAN: alignment assumption"; return "UBSAN: alignment assumption";
case ubsan_type_mismatch: case ubsan_type_mismatch:
return "UBSAN: type mismatch"; return "UBSAN: type mismatch";
#endif
#ifdef CONFIG_UBSAN_SIGNED_WRAP
/*
* SanitizerKind::SignedIntegerOverflow emits
* SanitizerHandler::AddOverflow, SanitizerHandler::SubOverflow,
* or SanitizerHandler::MulOverflow.
*/
case ubsan_add_overflow:
return "UBSAN: integer addition overflow";
case ubsan_sub_overflow:
return "UBSAN: integer subtraction overflow";
case ubsan_mul_overflow:
return "UBSAN: integer multiplication overflow";
#endif #endif
default: default:
return "UBSAN: unrecognized failure code"; return "UBSAN: unrecognized failure code";