diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-03-14 13:40:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-03-14 13:40:30 +1100 |
| commit | 43b1f7b30e19b4c5c5bdcd10e528a8714c1b9b6e (patch) | |
| tree | 82b5a11b601c87604c1843be1408ed1fb62596bc | |
| parent | c26cdbc01e38bca70f6ec81ed0f577de3483f953 (diff) | |
| parent | 2a991a90c830d396b463855f5fcd0b1d2642c2a6 (diff) | |
| download | linux-43b1f7b30e19b4c5c5bdcd10e528a8714c1b9b6e.tar.gz linux-43b1f7b30e19b4c5c5bdcd10e528a8714c1b9b6e.tar.xz | |
Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
| -rw-r--r-- | arch/Kconfig | 2 | ||||
| -rw-r--r-- | lib/Kconfig.ubsan | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 59dee290d94b..9f066785bb71 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -799,7 +799,7 @@ config CFI_CLANG depends on ARCH_SUPPORTS_CFI_CLANG depends on $(cc-option,-fsanitize=kcfi) help - This option enables Clang’s forward-edge Control Flow Integrity + This option enables Clang's forward-edge Control Flow Integrity (CFI) checking, where the compiler injects a runtime check to each indirect function call to ensure the target is a valid function with the correct static type. This restricts possible call targets and diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan index 48a67058f84e..e81e1ac4a919 100644 --- a/lib/Kconfig.ubsan +++ b/lib/Kconfig.ubsan @@ -119,6 +119,8 @@ config UBSAN_SIGNED_WRAP bool "Perform checking for signed arithmetic wrap-around" default UBSAN depends on !COMPILE_TEST + # The no_sanitize attribute was introduced in GCC with version 8. + depends on !CC_IS_GCC || GCC_VERSION >= 80000 depends on $(cc-option,-fsanitize=signed-integer-overflow) help This option enables -fsanitize=signed-integer-overflow which checks |