Commit 50e7b4a1 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

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: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Link: https://lkml.kernel.org/r/20210326151300.259429287@infradead.org
parent 7bd2a600

tools/objtool/special.c

+11 −1
Original line number Diff line number Diff line
@@ -106,6 +106,14 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry, 
			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_off = (unsigned int)new_reloc->addend;
@@ -154,7 +162,9 @@ int special_get_alts(struct elf *elf, struct list_head *alts) 
			memset(alt, 0, sizeof(*alt));



			ret = get_alt_entry(elf, entry, sec, idx, alt);

			if (ret)

			if (ret > 0)

				continue;

			if (ret < 0)

				return ret;



			list_add_tail(&alt->list, alts);