Merge tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 88a0bc8..9b2c492 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -177,9 +177,10 @@ config HARDENED_USERCOPY_PAGESPAN
 config FORTIFY_SOURCE
        bool "Harden common str/mem functions against buffer overflows"
        depends on ARCH_HAS_FORTIFY_SOURCE
-       # https://bugs.llvm.org/show_bug.cgi?id=50322
        # https://bugs.llvm.org/show_bug.cgi?id=41459
-       depends on !CC_IS_CLANG
+       depends on !CC_IS_CLANG || CLANG_VERSION >= 120001
+       # https://github.com/llvm/llvm-project/issues/53645
+       depends on !CC_IS_CLANG || !X86_32
        help
          Detect overflows of buffers in common string and memory functions
          where the compiler can determine and validate the buffer sizes.