This is a note to let you know that I've just added the patch titled ubsan: Restore dependency on ARCH_HAS_UBSAN to the 6.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ubsan-restore-dependency-on-arch_has_ubsan.patch and it can be found in the queue-6.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. commit f6171c217cb107bf59794997674d736847819da5 Author: Kees Cook <keescook@xxxxxxxxxxxx> Date: Tue May 14 16:37:48 2024 -0700 ubsan: Restore dependency on ARCH_HAS_UBSAN [ Upstream commit 890a64810d59b1a58ed26efc28cfd821fc068e84 ] While removing CONFIG_UBSAN_SANITIZE_ALL, ARCH_HAS_UBSAN wasn't correctly depended on. Restore this, as we do not want to attempt UBSAN builds unless it's actually been tested on a given architecture. Reported-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> Closes: https://lore.kernel.org/all/20240514095427.541201-1-masahiroy@xxxxxxxxxx Fixes: 918327e9b7ff ("ubsan: Remove CONFIG_UBSAN_SANITIZE_ALL") Link: https://lore.kernel.org/r/20240514233747.work.441-kees@xxxxxxxxxx Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan index e81e1ac4a919b..bdda600f8dfbe 100644 --- a/lib/Kconfig.ubsan +++ b/lib/Kconfig.ubsan @@ -4,6 +4,7 @@ config ARCH_HAS_UBSAN menuconfig UBSAN bool "Undefined behaviour sanity checker" + depends on ARCH_HAS_UBSAN help This option enables the Undefined Behaviour sanity checker. Compile-time instrumentation is used to detect various undefined