From bd6e36bcafb7fe5b7bb18d3b3680460330e6a7db Mon Sep 17 00:00:00 2001 From: Tony Hutter Date: Mon, 8 Jul 2024 17:01:30 -0700 Subject: [PATCH] Linux 6.9: Fix UBSAN errors in zap_micro.c You can use the UBSAN_SANITIZE_* Kbuild options to exclude certain kernel objects from the UBSAN checks. We previously excluded zap_micro.o with: UBSAN_SANITIZE_zap_micro.o := n For some reason that didn't work for the 6.9 kernel, which wants us to use: UBSAN_SANITIZE_zfs/zap_micro.o := n Signed-off-by: Tony Hutter Fixes: #16278 --- module/Kbuild.in | 1 + 1 file changed, 1 insertion(+) diff --git a/module/Kbuild.in b/module/Kbuild.in index 9e44364b75..4707452711 100644 --- a/module/Kbuild.in +++ b/module/Kbuild.in @@ -490,6 +490,7 @@ zfs-$(CONFIG_PPC64) += $(addprefix zfs/,$(ZFS_OBJS_PPC_PPC64)) UBSAN_SANITIZE_zap_leaf.o := n UBSAN_SANITIZE_zap_micro.o := n UBSAN_SANITIZE_sa.o := n +UBSAN_SANITIZE_zfs/zap_micro.o := n # Suppress incorrect warnings from versions of objtool which are not # aware of x86 EVEX prefix instructions used for AVX512.