On Mon, Jan 29, 2024 at 10:00 AM Kees Cook <[email protected]> wrote: > > Clang changed the way it enables UBSan trapping mode. Update the Makefile > logic to discover it. > > Suggested-by: Fangrui Song <[email protected]> > Link: > https://lore.kernel.org/lkml/cafp8o3jivzh+aav7n90nk7u2bhrnst6mrp0zhtfq-vj0m4+...@mail.gmail.com/ > Cc: Nathan Chancellor <[email protected]> > Cc: Masahiro Yamada <[email protected]> > Cc: Nicolas Schier <[email protected]> > Cc: Nick Desaulniers <[email protected]> > Cc: Bill Wendling <[email protected]> > Cc: Justin Stitt <[email protected]> > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Kees Cook <[email protected]> > --- > scripts/Makefile.ubsan | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/Makefile.ubsan b/scripts/Makefile.ubsan > index 4749865c1b2c..7cf42231042b 100644 > --- a/scripts/Makefile.ubsan > +++ b/scripts/Makefile.ubsan > @@ -10,6 +10,6 @@ ubsan-cflags-$(CONFIG_UBSAN_DIV_ZERO) += > -fsanitize=integer-divide-by-zero > ubsan-cflags-$(CONFIG_UBSAN_UNREACHABLE) += -fsanitize=unreachable > ubsan-cflags-$(CONFIG_UBSAN_BOOL) += -fsanitize=bool > ubsan-cflags-$(CONFIG_UBSAN_ENUM) += -fsanitize=enum > -ubsan-cflags-$(CONFIG_UBSAN_TRAP) += > -fsanitize-undefined-trap-on-error > +ubsan-cflags-$(CONFIG_UBSAN_TRAP) += $(call > cc-option,-fsanitize-trap=undefined,-fsanitize-undefined-trap-on-error) > > export CFLAGS_UBSAN := $(ubsan-cflags-y) > -- > 2.34.1
Thanks for the patch. Clang has had -fsanitize-trap= since 2015. GCC added -fsanitize-trap=undefined in 2022 (https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=2c7cfc7b418564 ; milestone: 13.1), so we cannot use -fsanitize-trap=undefined unconditionally. Reviewed-by: Fangrui Song <[email protected]> -- 宋方睿
