File tree Expand file tree Collapse file tree 4 files changed +9
-2
lines changed Expand file tree Collapse file tree 4 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -1050,6 +1050,10 @@ config HAVE_NOINSTR_HACK
1050
1050
config HAVE_NOINSTR_VALIDATION
1051
1051
bool
1052
1052
1053
+ config HAVE_UACCESS_VALIDATION
1054
+ bool
1055
+ select OBJTOOL
1056
+
1053
1057
config HAVE_STACK_VALIDATION
1054
1058
bool
1055
1059
help
Original file line number Diff line number Diff line change @@ -258,6 +258,7 @@ config X86
258
258
select HAVE_PREEMPT_DYNAMIC_CALL
259
259
select HAVE_RSEQ
260
260
select HAVE_SYSCALL_TRACEPOINTS
261
+ select HAVE_UACCESS_VALIDATION if HAVE_OBJTOOL
261
262
select HAVE_UNSTABLE_SCHED_CLOCK
262
263
select HAVE_USER_RETURN_NOTIFIER
263
264
select HAVE_GENERIC_VDSO
Original file line number Diff line number Diff line change @@ -218,7 +218,7 @@ objtool_args = \
218
218
$(if $(CONFIG_SLS), --sls) \
219
219
$(if $(CONFIG_STACK_VALIDATION), --stackval) \
220
220
$(if $(CONFIG_HAVE_STATIC_CALL_INLINE), --static-call) \
221
- --uaccess \
221
+ $(if $(CONFIG_HAVE_UACCESS_VALIDATION), --uaccess) \
222
222
$(if $(linked-object), --link) \
223
223
$(if $(part-of-module), --module) \
224
224
$(if $(CONFIG_GCOV_KERNEL), --no-unreachable)
Original file line number Diff line number Diff line change @@ -134,7 +134,9 @@ objtool_link()
134
134
objtoolopt=" ${objtoolopt} --static-call"
135
135
fi
136
136
137
- objtoolopt=" ${objtoolopt} --uaccess"
137
+ if is_enabled CONFIG_HAVE_UACCESS_VALIDATION; then
138
+ objtoolopt=" ${objtoolopt} --uaccess"
139
+ fi
138
140
fi
139
141
140
142
if is_enabled CONFIG_NOINSTR_VALIDATION; then
You can’t perform that action at this time.
0 commit comments