The following commit has been merged into the objtool/urgent branch of tip: Commit-ID: c2f75a43f5ae48b9babeb5b82c9f23fe18d3d144 Gitweb: https://git.kernel.org/tip/c2f75a43f5ae48b9babeb5b82c9f23fe18d3d144 Author: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> AuthorDate: Wed, 01 Jun 2022 09:42:12 -07:00 Committer: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> CommitterDate: Mon, 06 Jun 2022 11:49:55 -07:00 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@xxxxxxxxx> Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Link: https://lore.kernel.org/r/44c57668768c1ba1b4ba1ff541ec54781636e07c.1654101721.git.jpoimboe@xxxxxxxxxx --- lib/Kconfig.ubsan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan index c4fe15d..a9f7eb0 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
![]() |