Merge tag 'hardening-v6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[thirdparty/linux.git] / lib / ubsan.c

diff --git a/lib/ubsan.c b/lib/ubsan.c
index 5fc107f61934c28bd38b6997cd070ee8a25185b5..a1c983d148f16fe34493d6b933577556832bcdf6 100644 (file)
--- a/lib/ubsan.c
+++ b/lib/ubsan.c
@@ -44,9 +44,10 @@ const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type)
        case ubsan_shift_out_of_bounds:
                return "UBSAN: shift out of bounds";
 #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.
         */
        case ubsan_divrem_overflow:
@@ -77,6 +78,19 @@ const char *report_ubsan_failure(struct pt_regs *regs, u32 check_type)
                return "UBSAN: alignment assumption";
        case 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
        default:
                return "UBSAN: unrecognized failure code";