From: Thadeu Lima de Souza Cascardo Date: Fri, 1 Jul 2022 12:00:45 +0000 (-0300) Subject: objtool: skip non-text sections when adding return-thunk sites X-Git-Tag: v5.10.133~63 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=446eb6f08936e6f87bea9f35be05556a7211df9b;p=users%2Fdwmw2%2Flinux.git objtool: skip non-text sections when adding return-thunk sites The .discard.text section is added in order to reserve BRK, with a temporary function just so it can give it a size. This adds a relocation to the return thunk, which objtool will add to the .return_sites section. Linking will then fail as there are references to the .discard.text section. Do not add instructions from non-text sections to the list of return thunk calls, avoiding the reference to .discard.text. Signed-off-by: Thadeu Lima de Souza Cascardo Acked-by: Josh Poimboeuf Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 32203e458e440..95c2fd945a1b4 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -1090,7 +1090,9 @@ static void add_return_call(struct objtool_file *file, struct instruction *insn) insn->type = INSN_RETURN; insn->retpoline_safe = true; - list_add_tail(&insn->call_node, &file->return_thunk_list); + /* Skip the non-text sections, specially .discard ones */ + if (insn->sec->text) + list_add_tail(&insn->call_node, &file->return_thunk_list); } /*