From: Kees Cook <kees@kernel.org>
To: Qing Zhao <qing.zhao@oracle.com>
Cc: Kees Cook <kees@kernel.org>, Andrew Pinski <pinskia@gmail.com>,
Richard Biener <rguenther@suse.de>,
Joseph Myers <josmyers@redhat.com>, Jan Hubicka <hubicka@ucw.cz>,
Richard Earnshaw <richard.earnshaw@arm.com>,
Richard Sandiford <richard.sandiford@arm.com>,
Marcus Shawcroft <marcus.shawcroft@arm.com>,
Kyrylo Tkachov <kyrylo.tkachov@arm.com>,
Kito Cheng <kito.cheng@gmail.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Andrew Waterman <andrew@sifive.com>,
Jim Wilson <jim.wilson.gcc@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Dan Li <ashimida.1990@gmail.com>,
Sami Tolvanen <samitolvanen@google.com>,
Ramon de C Valle <rcvalle@google.com>,
Joao Moreira <joao@overdrivepizza.com>,
Nathan Chancellor <nathan@kernel.org>,
Bill Wendling <morbo@google.com>,
gcc-patches@gcc.gnu.org, linux-hardening@vger.kernel.org
Subject: [PATCH v2 0/7] Introduce Kernel Control Flow Integrity ABI [PR107048]
Date: Thu, 4 Sep 2025 17:24:08 -0700 [thread overview]
Message-ID: <20250905001157.it.269-kees@kernel.org> (raw)
Hi!
Here is v2, which is substantially changed compared to the RFC[1].
This series implements[2][3] the Linux Kernel Control Flow Integrity
ABI, which provides a function prototype based forward edge control flow
integrity protection by instrumenting every indirect call to check for
a hash value before the target function address. If the hash at the call
site and the hash at the target do not match, execution will trap.
The major change here is getting (what seems to be) proper KCFI RTL
working on the back end so that expansion Just Works. This meant all
the strange hacks I had for handling corner cases mostly went away,
and I was left with an optimizer that actually wanted to help me. :)
I revamped the mangler to do the hashing directly, and incorporated
design details into kcfi.cc (rather than putting it all in the commit
log). I'm using proper target hooks.
I've tested all 4 architectures now, and everything is working for me.
I'm still unsure about the arm32 and riscv RTL expansion: it seems strange
that I have to extract the CALL from PARALLEL patterns, but everything
I tried to match an PARALLEL kept failling.
For the commits, I ended up hand-building the ChangeLog trailers... I
assume there is a better way to do this, but I think I was just too
dense to find it. :P
Thanks!
-Kees
[1] https://lore.kernel.org/linux-hardening/20250821064202.work.893-kees@kernel.org/
[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107048
[3] https://github.com/KSPP/linux/issues/369
Kees Cook (7):
mangle: Introduce C typeinfo mangling API
kcfi: Add core Kernel Control Flow Integrity infrastructure
x86: Add x86_64 Kernel Control Flow Integrity implementation
aarch64: Add AArch64 Kernel Control Flow Integrity implementation
arm: Add ARM 32-bit Kernel Control Flow Integrity implementation
riscv: Add RISC-V Kernel Control Flow Integrity implementation
kcfi: Add regression test suite
gcc/kcfi.h | 47 +
gcc/kcfi.cc | 764 ++++++++++++
gcc/Makefile.in | 2 +
gcc/config/aarch64/aarch64-protos.h | 5 +
gcc/config/arm/arm-protos.h | 4 +
gcc/config/i386/i386-protos.h | 1 +
gcc/config/i386/i386.h | 3 +-
gcc/config/riscv/riscv-protos.h | 3 +
gcc/flag-types.h | 2 +
gcc/gimple.h | 21 +
gcc/mangle.h | 32 +
gcc/tree-pass.h | 3 +
gcc/testsuite/gcc.dg/kcfi/kcfi-adjacency.c | 73 ++
gcc/testsuite/gcc.dg/kcfi/kcfi-basics.c | 101 ++
gcc/testsuite/gcc.dg/kcfi/kcfi-call-sharing.c | 85 ++
.../gcc.dg/kcfi/kcfi-cold-partition.c | 137 +++
.../gcc.dg/kcfi/kcfi-complex-addressing.c | 125 ++
.../gcc.dg/kcfi/kcfi-ipa-robustness.c | 55 +
.../gcc.dg/kcfi/kcfi-move-preservation.c | 56 +
.../gcc.dg/kcfi/kcfi-no-sanitize-inline.c | 101 ++
gcc/testsuite/gcc.dg/kcfi/kcfi-no-sanitize.c | 41 +
.../gcc.dg/kcfi/kcfi-offset-validation.c | 50 +
.../gcc.dg/kcfi/kcfi-patchable-basic.c | 71 ++
.../gcc.dg/kcfi/kcfi-patchable-entry-only.c | 64 +
.../gcc.dg/kcfi/kcfi-patchable-large.c | 52 +
.../gcc.dg/kcfi/kcfi-patchable-medium.c | 61 +
.../gcc.dg/kcfi/kcfi-patchable-prefix-only.c | 61 +
.../gcc.dg/kcfi/kcfi-pic-addressing.c | 105 ++
.../gcc.dg/kcfi/kcfi-retpoline-r11.c | 51 +
gcc/testsuite/gcc.dg/kcfi/kcfi-tail-calls.c | 143 +++
.../gcc.dg/kcfi/kcfi-trap-encoding.c | 56 +
gcc/testsuite/gcc.dg/kcfi/kcfi-trap-section.c | 43 +
.../gcc.dg/kcfi/kcfi-type-mangling.c | 1064 +++++++++++++++++
gcc/c-family/c-attribs.cc | 12 +
gcc/config/aarch64/aarch64.cc | 115 ++
gcc/config/aarch64/aarch64.md | 64 +-
gcc/config/arm/arm.cc | 144 +++
gcc/config/arm/arm.md | 62 +
gcc/config/i386/i386-expand.cc | 21 +-
gcc/config/i386/i386.cc | 118 ++
gcc/config/i386/i386.md | 62 +-
gcc/config/riscv/riscv.cc | 147 +++
gcc/config/riscv/riscv.md | 74 +-
gcc/df-scan.cc | 6 +
gcc/doc/invoke.texi | 102 ++
gcc/doc/tm.texi | 31 +
gcc/doc/tm.texi.in | 12 +
gcc/final.cc | 3 +
gcc/mangle.cc | 512 ++++++++
gcc/opts.cc | 1 +
gcc/passes.cc | 1 +
gcc/passes.def | 3 +
gcc/rtl.def | 6 +
gcc/rtlanal.cc | 5 +
gcc/target.def | 38 +
gcc/testsuite/gcc.dg/kcfi/kcfi.exp | 36 +
gcc/toplev.cc | 11 +
gcc/tree-inline.cc | 10 +
gcc/varasm.cc | 46 +-
59 files changed, 5092 insertions(+), 32 deletions(-)
create mode 100644 gcc/kcfi.h
create mode 100644 gcc/kcfi.cc
create mode 100644 gcc/mangle.h
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-adjacency.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-basics.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-call-sharing.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-cold-partition.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-complex-addressing.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-ipa-robustness.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-move-preservation.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-no-sanitize-inline.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-no-sanitize.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-offset-validation.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-patchable-basic.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-patchable-entry-only.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-patchable-large.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-patchable-medium.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-patchable-prefix-only.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-pic-addressing.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-retpoline-r11.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-tail-calls.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-trap-encoding.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-trap-section.c
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi-type-mangling.c
create mode 100644 gcc/mangle.cc
create mode 100644 gcc/testsuite/gcc.dg/kcfi/kcfi.exp
--
2.34.1
next reply other threads:[~2025-09-05 0:24 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-05 0:24 Kees Cook [this message]
2025-09-05 0:24 ` [PATCH v2 1/7] mangle: Introduce C typeinfo mangling API Kees Cook
2025-09-05 0:50 ` Andrew Pinski
2025-09-05 1:09 ` Kees Cook
2025-09-05 0:24 ` [PATCH v2 2/7] kcfi: Add core Kernel Control Flow Integrity infrastructure Kees Cook
2025-09-05 8:51 ` Peter Zijlstra
2025-09-05 16:19 ` Kees Cook
2025-09-08 15:32 ` Peter Zijlstra
2025-09-08 21:55 ` Kees Cook
2025-09-09 18:49 ` Qing Zhao
2025-09-11 3:05 ` Kees Cook
2025-09-11 7:29 ` Peter Zijlstra
2025-09-12 6:20 ` Kees Cook
2025-09-11 15:04 ` Qing Zhao
2025-09-12 7:32 ` Kees Cook
2025-09-12 14:01 ` Qing Zhao
2025-09-13 6:29 ` Kees Cook
2025-09-05 0:24 ` [PATCH v2 3/7] x86: Add x86_64 Kernel Control Flow Integrity implementation Kees Cook
2025-09-05 0:24 ` [PATCH v2 4/7] aarch64: Add AArch64 " Kees Cook
2025-09-05 0:24 ` [PATCH v2 5/7] arm: Add ARM 32-bit " Kees Cook
2025-09-11 7:49 ` Ard Biesheuvel
2025-09-12 9:03 ` Kees Cook
2025-09-12 9:08 ` Kees Cook
2025-09-12 9:43 ` Ard Biesheuvel
2025-09-12 19:01 ` Kees Cook
2025-09-05 0:24 ` [PATCH v2 6/7] riscv: Add RISC-V " Kees Cook
2025-09-16 3:40 ` Jeff Law
2025-09-16 6:04 ` Kees Cook
2025-10-01 0:56 ` Jeff Law
2025-09-05 0:24 ` [PATCH v2 7/7] kcfi: Add regression test suite Kees Cook
2025-09-05 7:06 ` Jakub Jelinek
2025-09-05 17:15 ` Kees Cook
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=20250905001157.it.269-kees@kernel.org \
--to=kees@kernel.org \
--cc=andrew@sifive.com \
--cc=ashimida.1990@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=hubicka@ucw.cz \
--cc=jim.wilson.gcc@gmail.com \
--cc=joao@overdrivepizza.com \
--cc=josmyers@redhat.com \
--cc=kito.cheng@gmail.com \
--cc=kyrylo.tkachov@arm.com \
--cc=linux-hardening@vger.kernel.org \
--cc=marcus.shawcroft@arm.com \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=palmer@dabbelt.com \
--cc=peterz@infradead.org \
--cc=pinskia@gmail.com \
--cc=qing.zhao@oracle.com \
--cc=rcvalle@google.com \
--cc=rguenther@suse.de \
--cc=richard.earnshaw@arm.com \
--cc=richard.sandiford@arm.com \
--cc=samitolvanen@google.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.