summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJosh Poimboeuf <jpoimboe@kernel.org>2022-06-01 18:42:12 +0200
committerJosh Poimboeuf <jpoimboe@kernel.org>2022-06-06 20:49:55 +0200
commitc2f75a43f5ae48b9babeb5b82c9f23fe18d3d144 (patch)
tree5fcf1672975d7d5e30df6b86816333f736a9cda7 /lib
parentLinux 5.19-rc1 (diff)
downloadlinux-c2f75a43f5ae48b9babeb5b82c9f23fe18d3d144.tar.xz
linux-c2f75a43f5ae48b9babeb5b82c9f23fe18d3d144.zip
objtool: Fix obsolete reference to CONFIG_X86_SMAP
CONFIG_X86_SMAP no longer exists. For objtool's purposes it has been replaced with CONFIG_HAVE_UACCESS_VALIDATION. Fixes: 03f16cd020eb ("objtool: Add CONFIG_OBJTOOL") Reported-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Link: https://lore.kernel.org/r/44c57668768c1ba1b4ba1ff541ec54781636e07c.1654101721.git.jpoimboe@kernel.org
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig.ubsan2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan
index c4fe15d38b60..a9f7eb047768 100644
--- a/lib/Kconfig.ubsan
+++ b/lib/Kconfig.ubsan
@@ -94,7 +94,7 @@ config UBSAN_UNREACHABLE
bool "Perform checking for unreachable code"
# objtool already handles unreachable checking and gets angry about
# seeing UBSan instrumentation located in unreachable places.
- depends on !(OBJTOOL && (STACK_VALIDATION || UNWINDER_ORC || X86_SMAP))
+ depends on !(OBJTOOL && (STACK_VALIDATION || UNWINDER_ORC || HAVE_UACCESS_VALIDATION))
depends on $(cc-option,-fsanitize=unreachable)
help
This option enables -fsanitize=unreachable which checks for control