diff options
| author | Julien Thierry <jthierry@redhat.com> | 2020-03-27 15:28:41 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-20 10:24:13 +0200 |
| commit | b1f3bcd5494f920ab7a365b2bb5a195be54e25df (patch) | |
| tree | faf8c256cfe9ede080ead591ea30f43f1209d823 | |
| parent | 4688ba5b53400215889151f34fee51de7b483f71 (diff) | |
| download | linux-stable-b1f3bcd5494f920ab7a365b2bb5a195be54e25df.tar.gz linux-stable-b1f3bcd5494f920ab7a365b2bb5a195be54e25df.tar.bz2 linux-stable-b1f3bcd5494f920ab7a365b2bb5a195be54e25df.zip | |
objtool: Ignore empty alternatives
[ Upstream commit 7170cf47d16f1ba29eca07fd818870b7af0a93a5 ]
The .alternatives section can contain entries with no original
instructions. Objtool will currently crash when handling such an entry.
Just skip that entry, but still give a warning to discourage useless
entries.
Signed-off-by: Julien Thierry <jthierry@redhat.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | tools/objtool/check.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index b0b8ba9b800c..c7399d7f4bc7 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -778,6 +778,12 @@ static int add_special_section_alts(struct objtool_file *file) } if (special_alt->group) { + if (!special_alt->orig_len) { + WARN_FUNC("empty alternative entry", + orig_insn->sec, orig_insn->offset); + continue; + } + ret = handle_group_alt(file, special_alt, orig_insn, &new_insn); if (ret) |