* [PATCH] objtool: Add CONFIG_HAVE_UACCESS_VALIDATION
@ 2022-04-19 16:05 Josh Poimboeuf
2022-05-30 10:38 ` [tip: objtool/urgent] " tip-bot2 for Josh Poimboeuf
0 siblings, 1 reply; 2+ messages in thread
From: Josh Poimboeuf @ 2022-04-19 16:05 UTC (permalink / raw)
To: Peter Zijlstra; +Cc: linux-kernel, x86, Miroslav Benes
Allow an arch specify that it has objtool uaccess validation with
CONFIG_HAVE_UACCESS_VALIDATION. For now, doing so unconditionally
selects CONFIG_OBJTOOL.
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
arch/Kconfig | 4 ++++
arch/x86/Kconfig | 1 +
scripts/Makefile.build | 2 +-
scripts/link-vmlinux.sh | 4 +++-
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 1e19da774e55..694e0c2bc369 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1041,6 +1041,10 @@ config HAVE_NOINSTR_HACK
config HAVE_NOINSTR_VALIDATION
bool
+config HAVE_UACCESS_VALIDATION
+ bool
+ select OBJTOOL
+
config HAVE_STACK_VALIDATION
bool
help
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f1320d9a3da3..1a207a805102 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -257,6 +257,7 @@ config X86
select HAVE_PREEMPT_DYNAMIC_CALL
select HAVE_RSEQ
select HAVE_SYSCALL_TRACEPOINTS
+ select HAVE_UACCESS_VALIDATION if HAVE_OBJTOOL
select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_USER_RETURN_NOTIFIER
select HAVE_GENERIC_VDSO
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index f89d3fcff39f..de0d88f32f58 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -236,7 +236,7 @@ objtool_args = \
$(if $(CONFIG_SLS), --sls) \
$(if $(CONFIG_STACK_VALIDATION), --stackval) \
$(if $(CONFIG_HAVE_STATIC_CALL_INLINE), --static-call) \
- --uaccess \
+ $(if $(CONFIG_HAVE_UACCESS_VALIDATION), --uaccess) \
$(if $(linked-object), --link) \
$(if $(part-of-module), --module) \
$(if $(CONFIG_GCOV_KERNEL), --no-unreachable)
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index d7f26f02f142..3e23a1babad4 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -153,7 +153,9 @@ objtool_link()
objtoolopt="${objtoolopt} --static-call"
fi
- objtoolopt="${objtoolopt} --uaccess"
+ if is_enabled CONFIG_HAVE_UACCESS_VALIDATION; then
+ objtoolopt="${objtoolopt} --uaccess"
+ fi
fi
if is_enabled CONFIG_NOINSTR_VALIDATION; then
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: objtool/urgent] objtool: Add CONFIG_HAVE_UACCESS_VALIDATION
2022-04-19 16:05 [PATCH] objtool: Add CONFIG_HAVE_UACCESS_VALIDATION Josh Poimboeuf
@ 2022-05-30 10:38 ` tip-bot2 for Josh Poimboeuf
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Josh Poimboeuf @ 2022-05-30 10:38 UTC (permalink / raw)
To: linux-tip-commits
Cc: Josh Poimboeuf, Peter Zijlstra (Intel), x86, linux-kernel
The following commit has been merged into the objtool/urgent branch of tip:
Commit-ID: 5f3da8c08508df82823566c32f753071c8ad36af
Gitweb: https://git.kernel.org/tip/5f3da8c08508df82823566c32f753071c8ad36af
Author: Josh Poimboeuf <jpoimboe@redhat.com>
AuthorDate: Tue, 19 Apr 2022 09:05:09 -07:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 27 May 2022 12:34:43 +02:00
objtool: Add CONFIG_HAVE_UACCESS_VALIDATION
Allow an arch specify that it has objtool uaccess validation with
CONFIG_HAVE_UACCESS_VALIDATION. For now, doing so unconditionally
selects CONFIG_OBJTOOL.
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/d393d5e2fe73aec6e8e41d5c24f4b6fe8583f2d8.1650384225.git.jpoimboe@redhat.com
---
arch/Kconfig | 4 ++++
arch/x86/Kconfig | 1 +
scripts/Makefile.build | 2 +-
scripts/link-vmlinux.sh | 4 +++-
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 904ed51..cb29540 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1050,6 +1050,10 @@ config HAVE_NOINSTR_HACK
config HAVE_NOINSTR_VALIDATION
bool
+config HAVE_UACCESS_VALIDATION
+ bool
+ select OBJTOOL
+
config HAVE_STACK_VALIDATION
bool
help
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cf531fb..5f41f3c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -258,6 +258,7 @@ config X86
select HAVE_PREEMPT_DYNAMIC_CALL
select HAVE_RSEQ
select HAVE_SYSCALL_TRACEPOINTS
+ select HAVE_UACCESS_VALIDATION if HAVE_OBJTOOL
select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_USER_RETURN_NOTIFIER
select HAVE_GENERIC_VDSO
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 0640050..6a663b2 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -218,7 +218,7 @@ objtool_args = \
$(if $(CONFIG_SLS), --sls) \
$(if $(CONFIG_STACK_VALIDATION), --stackval) \
$(if $(CONFIG_HAVE_STATIC_CALL_INLINE), --static-call) \
- --uaccess \
+ $(if $(CONFIG_HAVE_UACCESS_VALIDATION), --uaccess) \
$(if $(linked-object), --link) \
$(if $(part-of-module), --module) \
$(if $(CONFIG_GCOV_KERNEL), --no-unreachable)
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index a7f6196..fd578c3 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -134,7 +134,9 @@ objtool_link()
objtoolopt="${objtoolopt} --static-call"
fi
- objtoolopt="${objtoolopt} --uaccess"
+ if is_enabled CONFIG_HAVE_UACCESS_VALIDATION; then
+ objtoolopt="${objtoolopt} --uaccess"
+ fi
fi
if is_enabled CONFIG_NOINSTR_VALIDATION; then
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-30 10:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-19 16:05 [PATCH] objtool: Add CONFIG_HAVE_UACCESS_VALIDATION Josh Poimboeuf
2022-05-30 10:38 ` [tip: objtool/urgent] " tip-bot2 for Josh Poimboeuf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).