objtool: Properly disable uaccess validation
If opts.uaccess isn't set, the uaccess validation is disabled, but only partially: it doesn't read the uaccess_safe_builtin list but still tries to do the validation. Disable it completely to prevent false warnings. Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: https://lore.kernel.org/r/0e95581c1d2107fb5f59418edf2b26bba38b0cbb.1742852846.git.jpoimboe@kernel.org
This commit is contained in:
parent
6b023c7842
commit
e1a9dda74d
@ -3187,7 +3187,7 @@ static int handle_insn_ops(struct instruction *insn,
|
||||
if (update_cfi_state(insn, next_insn, &state->cfi, op))
|
||||
return 1;
|
||||
|
||||
if (!insn->alt_group)
|
||||
if (!opts.uaccess || !insn->alt_group)
|
||||
continue;
|
||||
|
||||
if (op->dest.type == OP_DEST_PUSHF) {
|
||||
@ -3647,6 +3647,9 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
|
||||
return 0;
|
||||
|
||||
case INSN_STAC:
|
||||
if (!opts.uaccess)
|
||||
break;
|
||||
|
||||
if (state.uaccess) {
|
||||
WARN_INSN(insn, "recursive UACCESS enable");
|
||||
return 1;
|
||||
@ -3656,6 +3659,9 @@ static int validate_branch(struct objtool_file *file, struct symbol *func,
|
||||
break;
|
||||
|
||||
case INSN_CLAC:
|
||||
if (!opts.uaccess)
|
||||
break;
|
||||
|
||||
if (!state.uaccess && func) {
|
||||
WARN_INSN(insn, "redundant UACCESS disable");
|
||||
return 1;
|
||||
@ -4114,7 +4120,8 @@ static int validate_symbol(struct objtool_file *file, struct section *sec,
|
||||
if (!insn || insn->visited)
|
||||
return 0;
|
||||
|
||||
state->uaccess = sym->uaccess_safe;
|
||||
if (opts.uaccess)
|
||||
state->uaccess = sym->uaccess_safe;
|
||||
|
||||
ret = validate_branch(file, insn_func(insn), insn, *state);
|
||||
if (ret)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user