diff options
| author | Josh Poimboeuf <jpoimboe@kernel.org> | 2026-04-21 08:59:12 +0300 |
|---|---|---|
| committer | Josh Poimboeuf <jpoimboe@kernel.org> | 2026-05-05 07:16:01 +0300 |
| commit | 3787e82a4e3a0a04aeb5543580ee90bed3a36e55 (patch) | |
| tree | 5e669a1a0e2321cf513d21a17ec028bbc0b40bd1 | |
| parent | da4326573ae8d00a00a6015c8c3886812cd0adb4 (diff) | |
| download | linux-3787e82a4e3a0a04aeb5543580ee90bed3a36e55.tar.xz | |
objtool/klp: Fix relocation conversion failures for R_X86_64_NONE
Objtool has some hacks which NOP out certain calls/jumps and replace
their relocations with R_X86_64_NONE. The klp-diff relocation
extraction code will error out when trying to copy these relocations due
to their negative addend, which would only makes sense for a PC-relative
branch instruction. Just ignore them.
Fixes: dd590d4d57eb ("objtool/klp: Introduce klp diff subcommand for diffing object files")
Acked-by: Song Liu <song@kernel.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
| -rw-r--r-- | tools/objtool/klp-diff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c index dd0e51dfc621..19bc811db396 100644 --- a/tools/objtool/klp-diff.c +++ b/tools/objtool/klp-diff.c @@ -1033,6 +1033,9 @@ found_sym: */ static int convert_reloc_sym(struct elf *elf, struct reloc *reloc) { + if (reloc_type(reloc) == R_NONE) + return 1; + if (is_reloc_allowed(reloc)) return 0; |