From: Julien Thierry Date: Fri, 27 Mar 2020 15:28:40 +0000 (+0000) Subject: objtool: Clean instruction state before each function validation X-Git-Tag: block-5.8-2020-06-11~52^2~50 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0699e551af268c9841a205a3e90dc1615fb63d84;p=linux-2.6-block.git objtool: Clean instruction state before each function validation When a function fails its validation, it might leave a stale state that will be used for the validation of other functions. That would cause false warnings on potentially valid functions. Reset the instruction state before the validation of each individual function. Signed-off-by: Julien Thierry Acked-by: Peter Zijlstra (Intel) Reviewed-by: Miroslav Benes Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar --- diff --git a/tools/objtool/check.c b/tools/objtool/check.c index c18eca151b6d..5b67d6150a0b 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2411,13 +2411,6 @@ static int validate_section(struct objtool_file *file, struct section *sec) struct insn_state state; int ret, warnings = 0; - clear_insn_state(&state); - - state.cfa = initial_func_cfi.cfa; - memcpy(&state.regs, &initial_func_cfi.regs, - CFI_NUM_REGS * sizeof(struct cfi_reg)); - state.stack_size = initial_func_cfi.cfa.offset; - list_for_each_entry(func, &sec->symbol_list, list) { if (func->type != STT_FUNC) continue; @@ -2435,6 +2428,12 @@ static int validate_section(struct objtool_file *file, struct section *sec) if (!insn || insn->ignore || insn->visited) continue; + clear_insn_state(&state); + state.cfa = initial_func_cfi.cfa; + memcpy(&state.regs, &initial_func_cfi.regs, + CFI_NUM_REGS * sizeof(struct cfi_reg)); + state.stack_size = initial_func_cfi.cfa.offset; + state.uaccess = func->uaccess_safe; ret = validate_branch(file, func, insn, state);