UBSan: Allow custom the sanitizer in Kconfig

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>

arch/arm/src/arm/Toolchain.defs

@@ -84,7 +84,7 @@ ifeq ($(CONFIG_MM_KASAN_ALL),y)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

arch/arm/src/armv6-m/Toolchain.defs

@@ -170,7 +170,7 @@ ifeq ($(CONFIG_MM_KASAN_ALL),y)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

arch/arm/src/armv7-a/Toolchain.defs

@@ -125,7 +125,7 @@ ifeq ($(CONFIG_ARCH_COVERAGE_ALL),y)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

arch/arm/src/armv7-m/Toolchain.defs

@@ -90,7 +90,7 @@ ifeq ($(CONFIG_ARMV7M_STACKCHECK),y)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

arch/arm/src/armv7-r/Toolchain.defs

@@ -101,7 +101,7 @@ ifeq ($(CONFIG_MM_KASAN_ALL),y)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

arch/arm/src/armv8-m/Toolchain.defs

@@ -90,7 +90,7 @@ ifeq ($(CONFIG_ARMV8M_STACKCHECK),y)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

arch/arm64/src/Toolchain.defs

@@ -63,7 +63,7 @@ ifeq ($(CONFIG_ARCH_COVERAGE_ALL),y)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

arch/risc-v/src/common/Toolchain.defs

@@ -167,7 +167,7 @@ ifeq ($(CONFIG_MM_KASAN_ALL),y)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

arch/xtensa/src/lx6/Toolchain.defs

@@ -48,7 +48,7 @@ ifeq ($(CONFIG_MM_KASAN_ALL),y)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

arch/xtensa/src/lx7/Toolchain.defs

@@ -48,7 +48,7 @@ ifeq ($(CONFIG_MM_KASAN_ALL),y)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

boards/sim/sim/sim/scripts/Make.defs

@@ -78,9 +78,9 @@ else ifeq ($(CONFIG_MM_KASAN_ALL),y)
 endif
 
 ifeq ($(CONFIG_SIM_UBSAN),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 else ifeq ($(CONFIG_MM_UBSAN_ALL),y)
-  ARCHOPTIMIZATION += -fsanitize=undefined
+  ARCHOPTIMIZATION += $(CONFIG_MM_UBSAN_OPTION)
 endif
 
 ifeq ($(CONFIG_MM_UBSAN_TRAP_ON_ERROR),y)

mm/Kconfig

@@ -222,6 +222,15 @@ config MM_UBSAN_ALL
 		will get image size increased and performance decreased
 		significantly.
 
+config MM_UBSAN_OPTION
+	string "UBSan options"
+	depends on MM_UBSAN
+	default "-fsanitize=undefined"
+	---help---
+		This option activates specified UBSan instrumentation. Please
+		refer to https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html
+		for available options.
+
 config MM_UBSAN_TRAP_ON_ERROR
 	bool "Enable UBsan trap on error to crash immediately"
 	depends on MM_UBSAN