diff mbox series

[07/14] UBUNTU: [Config] align UBSAN config with debian.master

Message ID 20221027084203.75281-8-paolo.pisati@canonical.com
State New
Headers show
Series Use annotations from debian.master | expand

Commit Message

Paolo Pisati Oct. 27, 2022, 8:41 a.m. UTC 
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.kvm/config/config.common.ubuntu | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/debian.kvm/config/config.common.ubuntu b/debian.kvm/config/config.common.ubuntu
index 002c15f96de5..eb21d052fe84 100644
--- a/debian.kvm/config/config.common.ubuntu
+++ b/debian.kvm/config/config.common.ubuntu
@@ -332,6 +332,7 @@  CONFIG_CC_HAS_RETURN_THUNK=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
 CONFIG_CC_HAS_SLS=y
+CONFIG_CC_HAS_UBSAN_BOUNDS=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
@@ -2812,6 +2813,7 @@  CONFIG_TEST_BPF=m
 # CONFIG_TEST_STRING_HELPERS is not set
 # CONFIG_TEST_STRSCPY is not set
 # CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UBSAN is not set
 # CONFIG_TEST_UDELAY is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_UUID is not set
@@ -2878,7 +2880,16 @@  CONFIG_UBIFS_FS_SECURITY=y
 CONFIG_UBIFS_FS_XATTR=y
 CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UBIFS_FS_ZSTD=y
-# CONFIG_UBSAN is not set
+CONFIG_UBSAN=y
+# CONFIG_UBSAN_ALIGNMENT is not set
+CONFIG_UBSAN_BOOL=y
+CONFIG_UBSAN_BOUNDS=y
+# CONFIG_UBSAN_DIV_ZERO is not set
+CONFIG_UBSAN_ENUM=y
+CONFIG_UBSAN_ONLY_BOUNDS=y
+CONFIG_UBSAN_SANITIZE_ALL=y
+CONFIG_UBSAN_SHIFT=y
+# CONFIG_UBSAN_TRAP is not set
 CONFIG_UBUNTU_HOST=m
 CONFIG_UCLAMP_BUCKETS_COUNT=5
 CONFIG_UCLAMP_TASK=y