Live Patching
 help / color / mirror / Atom feed
From: Song Liu <song@kernel.org>
To: live-patching@vger.kernel.org
Cc: jpoimboe@kernel.org, peterz@infradead.org, jikos@kernel.org,
	mbenes@suse.cz, pmladek@suse.com, joe.lawrence@redhat.com,
	puranjay@kernel.org, kernel-team@meta.com,
	Song Liu <song@kernel.org>
Subject: [PATCH v5 41/58] objtool/klp: Add test for kCFI prefix symbols and traps
Date: Wed, 16 Sep 2026 11:43:34 -0700	[thread overview]
Message-ID: <20260916184351.2720310-42-song@kernel.org> (raw)
In-Reply-To: <20260916184351.2720310-1-song@kernel.org>

Two properties, asserted separately because they fail differently:

  - the __cfi_<func> prefix symbol has to be carried with the patched
    function, or the function has no type identity and indirect calls to it
    trap;
  - its .kcfi_traps entry has to be extracted, or the trap is not
    recognised as a CFI failure and a clean report becomes an oops.

test-special-section hand-assembles a .kcfi_traps entry, which is what
makes it catch commit 7df1638df97b ("objtool/klp: Fix .kcfi_traps special
section extraction").  Nothing until now built real kCFI code.

This tests the behavior of commit da4326573ae8 ("objtool/klp: Fix kCFI trap
handling").  Commit f7ceffd21a8a ("objtool/klp: Fix kCFI prefix
finding/cloning") cannot be tested as such, its code having been rewritten
by commit fe6a87e0abac ("objtool: Improve and simplify prefix symbol
detection"); this guards the current implementation's behaviour instead.

Assisted-by: Claude:claude-opus-4
Based-on-test-by: Joe Lawrence <joe.lawrence@redhat.com>
Assisted-by: Claude:claude-opus-5
Signed-off-by: Song Liu <song@kernel.org>
---
 tools/objtool/tests/x86/fixtures/kcfi.c | 39 +++++++++++++++++++++++++
 tools/objtool/tests/x86/test-kcfi.sh    | 39 +++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 tools/objtool/tests/x86/fixtures/kcfi.c
 create mode 100755 tools/objtool/tests/x86/test-kcfi.sh

diff --git a/tools/objtool/tests/x86/fixtures/kcfi.c b/tools/objtool/tests/x86/fixtures/kcfi.c
new file mode 100644
index 000000000000..b62fc60634cf
--- /dev/null
+++ b/tools/objtool/tests/x86/fixtures/kcfi.c
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * An indirect call, which under kCFI is preceded by a type check and a trap.
+ *
+ * Clang emits a __cfi_<func> prefix symbol carrying the type hash ahead of
+ * every address-taken function, and records the trap site in .kcfi_traps.
+ * Both belong to the function and both have to come with it into a patch.
+ *
+ * Needs -fsanitize=kcfi, which only Clang has.
+ */
+
+static const char __modinfo[]
+	__attribute__((section(".modinfo"), used, aligned(1))) = "\0name=vmlinux";
+
+static int impl_a(int x)
+{
+	return x + 1;
+}
+
+static int impl_b(int x)
+{
+	return x * 2;
+}
+
+__attribute__((noinline)) int (*pick(int x))(int)
+{
+	return (x & 1) ? impl_a : impl_b;
+}
+
+int target(int x)
+{
+	int (*fn)(int arg) = pick(x);
+
+#ifdef PATCHED
+	return fn(x) + 2;
+#else
+	return fn(x) + 1;
+#endif
+}
diff --git a/tools/objtool/tests/x86/test-kcfi.sh b/tools/objtool/tests/x86/test-kcfi.sh
new file mode 100755
index 000000000000..b583ef608747
--- /dev/null
+++ b/tools/objtool/tests/x86/test-kcfi.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# Under kCFI an indirect call checks a type hash before jumping, and traps on a
+# mismatch.  Two things belong to the calling function and must come with it
+# into a patch:
+#
+#   - the __cfi_<func> prefix symbol holding the hash.  Lose it and the patched
+#     function has no type identity, so indirect calls to it trap.
+#   - its .kcfi_traps entry.  Lose that and the trap is not recognised as a
+#     CFI failure, so what should be a clean report becomes an oops.
+#
+# Neither shows up at build time.
+
+. "$(dirname "$0")/../lib.sh"
+
+clang_only "kCFI is a Clang feature"
+
+setup
+
+# Declared above that this is Clang's; a given Clang may still be too old.
+cc_supports -fsanitize=kcfi ||
+	probe_skip "this clang does not support -fsanitize=kcfi"
+
+build_pair kcfi.c -fsanitize=kcfi
+
+assert_input_section .kcfi_traps
+assert_input_symbol __cfi_target
+
+run_diff
+
+assert_patched target
+
+# The prefix symbol comes with its function ...
+assert_symbol __cfi_target
+# ... and so does the trap entry.
+assert_section .kcfi_traps
+
+pass "kCFI prefix symbol and trap entry carried with the patched function"
-- 
2.53.0-Meta


  parent reply	other threads:[~2026-09-16 18:47 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-16 18:42 [PATCH v5 00/58] Unit test framework for klp-build toolchain Song Liu
2026-09-16 18:42 ` [PATCH v5 01/58] objtool: Add test harness for the klp subcommands Song Liu
2026-09-16 18:42 ` [PATCH v5 02/58] objtool/klp: Check the klp test environment once, before any test Song Liu
2026-09-16 18:42 ` [PATCH v5 03/58] objtool/klp: Group the klp tests by architecture Song Liu
2026-09-16 18:42 ` [PATCH v5 04/58] objtool/klp: Classify klp test outcomes Song Liu
2026-09-16 18:42 ` [PATCH v5 05/58] objtool/klp: Build klp test fixtures through the harness Song Liu
2026-09-16 18:42 ` [PATCH v5 06/58] objtool/klp: Grow the klp test harness vocabulary Song Liu
2026-09-16 18:43 ` [PATCH v5 07/58] objtool/klp: Give each run one working directory, one per test inside it Song Liu
2026-09-16 18:43 ` [PATCH v5 08/58] objtool/klp: Run the klp tests under set -u Song Liu
2026-09-16 18:43 ` [PATCH v5 09/58] objtool/klp: Document the klp test harness Song Liu
2026-09-16 18:43 ` [PATCH v5 10/58] objtool: Keep failing test workdirs by default Song Liu
2026-09-16 18:43 ` [PATCH v5 11/58] objtool: Forward toolchain variables to the klp test runner Song Liu
2026-09-16 18:43 ` [PATCH v5 12/58] objtool/klp: Add test for rejecting changed data Song Liu
2026-09-16 18:43 ` [PATCH v5 13/58] objtool/klp: Add test for newly introduced data Song Liu
2026-09-16 18:43 ` [PATCH v5 14/58] objtool/klp: Add test for newly introduced functions Song Liu
2026-09-16 18:43 ` [PATCH v5 15/58] objtool/klp: Add test for static local correlation Song Liu
2026-09-16 18:43 ` [PATCH v5 16/58] objtool/klp: Add test for cold function halves Song Liu
2026-09-16 18:43 ` [PATCH v5 17/58] objtool/klp: Add test for special section extraction Song Liu
2026-09-16 18:43 ` [PATCH v5 18/58] objtool/klp: Add test for selective " Song Liu
2026-09-16 18:43 ` [PATCH v5 19/58] objtool/klp: Add test for jump table key relocations Song Liu
2026-09-16 18:43 ` [PATCH v5 20/58] objtool/klp: Add test for rejecting module-owned static branch keys Song Liu
2026-09-16 18:43 ` [PATCH v5 21/58] objtool/klp: Add test for rejecting module-owned static call keys Song Liu
2026-09-16 18:43 ` [PATCH v5 22/58] objtool/klp: Add test for symids in discarded sections Song Liu
2026-09-16 18:43 ` [PATCH v5 23/58] objtool/klp: Add test for rejecting references to init code/data Song Liu
2026-09-16 18:43 ` [PATCH v5 24/58] objtool/klp: Add test for correlation across ThinLTO name mangling Song Liu
2026-09-16 18:43 ` [PATCH v5 25/58] objtool/klp: Add test for objects without .modinfo Song Liu
2026-09-16 18:43 ` [PATCH v5 26/58] objtool/klp: Add test for unchecksummed input Song Liu
2026-09-16 18:43 ` [PATCH v5 27/58] objtool/klp: Add klp diff and post-link regression tests Song Liu
2026-09-16 18:43 ` [PATCH v5 28/58] objtool/klp: Add test for klp reloc section naming in module objects Song Liu
2026-09-16 18:43 ` [PATCH v5 29/58] objtool/klp: Add test for vmlinux relocs in a patched module Song Liu
2026-09-16 18:43 ` [PATCH v5 30/58] objtool/klp: Add test for Module.symvers path normalization Song Liu
2026-09-16 18:43 ` [PATCH v5 31/58] objtool/klp: Add test for the contents of the klp_funcs list Song Liu
2026-09-16 18:43 ` [PATCH v5 32/58] objtool/klp: Add test for EXPORT_SYMBOL_FOR_MODULES references Song Liu
2026-09-16 18:43 ` [PATCH v5 33/58] objtool/klp: Add test for new references to exported symbols Song Liu
2026-09-16 18:43 ` [PATCH v5 34/58] objtool/klp: Add test for empty x86 alternative replacements Song Liu
2026-09-16 18:43 ` [PATCH v5 35/58] objtool/klp: Add test for recorded checksum values Song Liu
2026-09-16 18:43 ` [PATCH v5 36/58] objtool/klp: Add test for position-independent checksums Song Liu
2026-09-16 19:01   ` sashiko-bot
2026-09-16 21:43     ` Song Liu
2026-09-17  0:22       ` Josh Poimboeuf
2026-09-16 18:43 ` [PATCH v5 37/58] objtool/klp: Add test for sympos in module objects Song Liu
2026-09-16 18:43 ` [PATCH v5 38/58] objtool/klp: Add test for sympos resolved against a linked vmlinux Song Liu
2026-09-16 18:43 ` [PATCH v5 39/58] objtool/klp: Add test for static locals which must not be correlated Song Liu
2026-09-16 18:43 ` [PATCH v5 40/58] objtool/klp: Add test for __bug_table, __ex_table and __mcount_loc extraction Song Liu
2026-09-16 18:43 ` Song Liu [this message]
2026-09-16 18:43 ` [PATCH v5 42/58] objtool/klp: Add test for symbols whose linkage the patch changes Song Liu
2026-09-16 18:43 ` [PATCH v5 43/58] objtool/klp: Test rejection of a file-local static branch key Song Liu
2026-09-16 19:00   ` sashiko-bot
2026-09-16 21:39     ` Song Liu
2026-09-16 18:43 ` [PATCH v5 44/58] objtool/klp: Test a hand-built livepatch module's static call keys Song Liu
2026-09-16 18:43 ` [PATCH v5 45/58] objtool/klp: Test text annotations on alternative replacements Song Liu
2026-09-16 18:43 ` [PATCH v5 46/58] objtool/klp: Add test for data object checksums Song Liu
2026-09-16 18:43 ` [PATCH v5 47/58] objtool/klp: Add test for symbols with no checksum entry of their own Song Liu
2026-09-16 18:43 ` [PATCH v5 48/58] objtool/klp: Add test for a static branch introduced by the patch Song Liu
2026-09-16 18:43 ` [PATCH v5 49/58] objtool/klp: Add test for tracepoint and pr_debug static branch keys Song Liu
2026-09-16 18:43 ` [PATCH v5 50/58] objtool/klp: Add test for a static call introduced by the patch Song Liu
2026-09-16 18:43 ` [PATCH v5 51/58] objtool/klp: Add test for instruction operand checksums Song Liu
2026-09-16 18:43 ` [PATCH v5 52/58] objtool/klp: Add test for alternative replacement code in checksums Song Liu
2026-09-16 18:43 ` [PATCH v5 53/58] objtool/klp: Add test for the alignment of cloned data sections Song Liu
2026-09-16 18:43 ` [PATCH v5 54/58] objtool/klp: Add test for a patch which strips a data annotation Song Liu
2026-09-16 18:43 ` [PATCH v5 55/58] objtool/klp: Add test for absolute and __ADDRESSABLE symbols Song Liu
2026-09-16 18:43 ` [PATCH v5 56/58] objtool/klp: Add test for UBSAN metadata in an unchanged function Song Liu
2026-09-16 18:43 ` [PATCH v5 57/58] objtool/klp: Add test for Clang switch jump tables Song Liu
2026-09-16 18:43 ` [PATCH v5 58/58] objtool/klp: Add test for ThinLTO symbols sharing a demangled name Song Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260916184351.2720310-42-song@kernel.org \
    --to=song@kernel.org \
    --cc=jikos@kernel.org \
    --cc=joe.lawrence@redhat.com \
    --cc=jpoimboe@kernel.org \
    --cc=kernel-team@meta.com \
    --cc=live-patching@vger.kernel.org \
    --cc=mbenes@suse.cz \
    --cc=peterz@infradead.org \
    --cc=pmladek@suse.com \
    --cc=puranjay@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox