env: Add option for CONFIG_UBSAN_BOUNDS in Arch and Fedora builds

This can help catch obvious bugs. Signed-off-by: Nathan Chancellor <[email protected]>
nathanchance · Nov 15, 2023 · 9cef521 · 9cef521
1 parent e0f28b8
commit 9cef521
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/fish/functions/cbl_bld_krnl_pkg.fish b/fish/functions/cbl_bld_krnl_pkg.fish
@@ -7,7 +7,7 @@ function cbl_bld_krnl_pkg -d "Build ClangBuiltLinux Arch Linux kernel package"
 
     for arg in $argv
         switch $arg
-            case --cfi --cfi-permissive -f --full -l --local --lto -m --menuconfig
+            case --cfi --cfi-permissive -f --full -l --local --lto -m --menuconfig -u --ubsan-bounds
                 set -a config_args $arg
             case -p --permissive
                 set -a config_args --cfi-permissive

diff --git a/fish/functions/cbl_bld_krnl_rpm.fish b/fish/functions/cbl_bld_krnl_rpm.fish
@@ -12,7 +12,7 @@ function cbl_bld_krnl_rpm -d "Build a .rpm kernel package"
     # Allow cross compiling
     for arg in $argv
         switch $arg
-            case --cfi --cfi-permissive --lto --no-werror
+            case --cfi --cfi-permissive --lto --no-werror -u --ubsan-bounds
                 set -a gen_config_args $arg
             case -g --gcc
                 set gcc true

diff --git a/fish/functions/cbl_gen_archconfig.fish b/fish/functions/cbl_gen_archconfig.fish
@@ -22,6 +22,16 @@ function cbl_gen_archconfig -d "Generate a configuration file for Arch Linux"
                     -e LTO_CLANG_THIN
             case -m --menuconfig
                 set menuconfig true
+            case -u --ubsan-bounds
+                set -a config_args \
+                    -e UBSAN \
+                    -e UBSAN_BOUNDS \
+                    -d UBSAN_ALIGNMENT \
+                    -d UBSAN_BOOL \
+                    -d UBSAN_DIV_ZERO \
+                    -d UBSAN_ENUM \
+                    -d UBSAN_SHIFT \
+                    -d UBSAN_UNREACHABLE
             case linux-debug linux-mainline-'*' linux-next-'*'
                 set pkg $arg
         end
@@ -71,7 +81,7 @@ function cbl_gen_archconfig -d "Generate a configuration file for Arch Linux"
     # Step 5: Run through olddefconfig with Clang
     kmake -C $src KCONFIG_CONFIG=$cfg LLVM=1 LLVM_IAS=1 olddefconfig
 
-    # Step 6: Enable ThinLTO or CFI
+    # Step 6: Enable ThinLTO, CFI, or UBSAN
     if test -n "$config_args"
         $src/scripts/config \
             --file $cfg \

diff --git a/fish/functions/cbl_gen_fedoraconfig.fish b/fish/functions/cbl_gen_fedoraconfig.fish
@@ -21,6 +21,16 @@ function cbl_gen_fedoraconfig -d "Downloads and modifies Fedora's kernel configu
                     -e LTO_CLANG_THIN
             case --no-werror
                 set no_werror true
+            case -u --ubsan-bounds
+                set -a scripts_config_args \
+                    -e UBSAN \
+                    -e UBSAN_BOUNDS \
+                    -d UBSAN_ALIGNMENT \
+                    -d UBSAN_BOOL \
+                    -d UBSAN_DIV_ZERO \
+                    -d UBSAN_ENUM \
+                    -d UBSAN_SHIFT \
+                    -d UBSAN_UNREACHABLE
         end
     end
     if not set -q arch