[tip: objtool/core] objtool/klp: Fix kCFI trap handling
From: tip-bot2 for Josh Poimboeuf
Date: Tue May 05 2026 - 07:22:20 EST
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: da4326573ae8d00a00a6015c8c3886812cd0adb4
Gitweb: https://git.kernel.org/tip/da4326573ae8d00a00a6015c8c3886812cd0adb4
Author: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
AuthorDate: Mon, 20 Apr 2026 20:37:39 -07:00
Committer: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
CommitterDate: Mon, 04 May 2026 21:16:01 -07:00
objtool/klp: Fix kCFI trap handling
.kcfi_traps contains references to kCFI trap instruction locations.
When a KCFI type check fails at an indirect call, the trap handler looks
up the faulting address in this section.
Add it to the special sections list so the entries get extracted for the
changed functions they reference.
Acked-by: Song Liu <song@xxxxxxxxxx>
Reviewed-by: Miroslav Benes <mbenes@xxxxxxx>
Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
---
tools/objtool/klp-diff.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c
index 42970b3..dd0e51d 100644
--- a/tools/objtool/klp-diff.c
+++ b/tools/objtool/klp-diff.c
@@ -291,6 +291,7 @@ static bool is_special_section(struct section *sec)
{
static const char * const specials[] = {
".altinstructions",
+ ".kcfi_traps",
".smp_locks",
"__bug_table",
"__ex_table",