]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
objtool: Ignore dangling jump table entries
authorJosh Poimboeuf <jpoimboe@kernel.org>
Tue, 14 Jan 2025 21:57:58 +0000 (13:57 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Mar 2025 19:54:16 +0000 (12:54 -0700)
[ Upstream commit 3724062ca2b1364f02cf44dbea1a552227844ad1 ]

Clang sometimes leaves dangling unused jump table entries which point to
the end of the function.  Ignore them.

Closes: https://lore.kernel.org/20250113235835.vqgvb7cdspksy5dn@jpoimboe
Reported-by: Klaus Kusche <klaus.kusche@computerix.info>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/ee25c0b7e80113e950bd1d4c208b671d35774ff4.1736891751.git.jpoimboe@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/objtool/check.c

index 1691aa6e6ce32d627bcaace436a0893b85cd3507..3c3e5760e81b83dfde8e5eedfae24c92c6308a38 100644 (file)
@@ -2061,6 +2061,14 @@ static int add_jump_table(struct objtool_file *file, struct instruction *insn,
                    reloc_addend(reloc) == pfunc->offset)
                        break;
 
+               /*
+                * Clang sometimes leaves dangling unused jump table entries
+                * which point to the end of the function.  Ignore them.
+                */
+               if (reloc->sym->sec == pfunc->sec &&
+                   reloc_addend(reloc) == pfunc->offset + pfunc->len)
+                       goto next;
+
                dest_insn = find_insn(file, reloc->sym->sec, reloc_addend(reloc));
                if (!dest_insn)
                        break;
@@ -2078,6 +2086,7 @@ static int add_jump_table(struct objtool_file *file, struct instruction *insn,
                alt->insn = dest_insn;
                alt->next = insn->alts;
                insn->alts = alt;
+next:
                prev_offset = reloc_offset(reloc);
        }