提交 50e7b4a1 编写于 作者: P Peter Zijlstra 提交者: Ingo Molnar

objtool: Skip magical retpoline .altinstr_replacement

When the .altinstr_replacement is a retpoline, skip the alternative.
We already special case retpolines anyway.
Signed-off-by: NPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: NBorislav Petkov <bp@suse.de>
Signed-off-by: NIngo Molnar <mingo@kernel.org>
Reviewed-by: NMiroslav Benes <mbenes@suse.cz>
Link: https://lkml.kernel.org/r/20210326151300.259429287@infradead.org
上级 7bd2a600
...@@ -106,6 +106,14 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry, ...@@ -106,6 +106,14 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry,
return -1; return -1;
} }
/*
* Skip retpoline .altinstr_replacement... we already rewrite the
* instructions for retpolines anyway, see arch_is_retpoline()
* usage in add_{call,jump}_destinations().
*/
if (arch_is_retpoline(new_reloc->sym))
return 1;
alt->new_sec = new_reloc->sym->sec; alt->new_sec = new_reloc->sym->sec;
alt->new_off = (unsigned int)new_reloc->addend; alt->new_off = (unsigned int)new_reloc->addend;
...@@ -154,7 +162,9 @@ int special_get_alts(struct elf *elf, struct list_head *alts) ...@@ -154,7 +162,9 @@ int special_get_alts(struct elf *elf, struct list_head *alts)
memset(alt, 0, sizeof(*alt)); memset(alt, 0, sizeof(*alt));
ret = get_alt_entry(elf, entry, sec, idx, alt); ret = get_alt_entry(elf, entry, sec, idx, alt);
if (ret) if (ret > 0)
continue;
if (ret < 0)
return ret; return ret;
list_add_tail(&alt->list, alts); list_add_tail(&alt->list, alts);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册