From: Sami Tolvanen <samitolvanen@google.com>
To: Kees Cook <keescook@chromium.org>
Cc: Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Masahiro Yamada <masahiroy@kernel.org>,
Will Deacon <will@kernel.org>, Jessica Yu <jeyu@kernel.org>,
Arnd Bergmann <arnd@arndb.de>, Tejun Heo <tj@kernel.org>,
"Paul E. McKenney" <paulmck@kernel.org>,
Christoph Hellwig <hch@infradead.org>,
Peter Zijlstra <peterz@infradead.org>,
Sedat Dilek <sedat.dilek@gmail.com>,
bpf@vger.kernel.org, linux-hardening@vger.kernel.org,
linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kbuild@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com,
Sami Tolvanen <samitolvanen@google.com>
Subject: [PATCH v4 00/17] Add support for Clang CFI
Date: Wed, 31 Mar 2021 14:27:04 -0700 [thread overview]
Message-ID: <20210331212722.2746212-1-samitolvanen@google.com> (raw)
This series adds support for Clang's Control-Flow Integrity (CFI)
checking. With CFI, the compiler injects a runtime check before each
indirect function call to ensure the target is a valid function with
the correct static type. This restricts possible call targets and
makes it more difficult for an attacker to exploit bugs that allow the
modification of stored function pointers. For more details, see:
https://clang.llvm.org/docs/ControlFlowIntegrity.html
The first patch contains build system changes and error handling,
and implements support for cross-module indirect call checking. The
remaining patches address issues caused by the compiler
instrumentation. These include fixing known type mismatches, as well
as issues with address space confusion and cross-module function
address equality.
These patches add support only for arm64, but I'll post patches also
for x86_64 after we address the remaining issues there, including
objtool support.
You can also pull this series from
https://github.com/samitolvanen/linux.git cfi-v4
---
Changes in v4:
- Per Mark's suggestion, dropped __pa_function() and renamed
__va_function() to function_nocfi().
- Added a comment to function_nocfi() to explain what it does.
- Updated the psci patch to use an intermediate variable for
the physical address for clarity.
Changes in v3:
- Added a patch to change list_sort() callers treewide to use
const pointers instead of simply removing the internal casts.
- Changed cleanup_symbol_name() to return bool.
- Changed module.lds.S to drop the .eh_frame section only with
CONFIG_CFI_CLANG.
- Switched to synchronize_rcu() in update_shadow().
Changes in v2:
- Fixed .text merging in module.lds.S.
- Added WARN_ON_FUNCTION_MISMATCH() and changed kernel/thread.c
and kernel/workqueue.c to use the macro instead.
Sami Tolvanen (17):
add support for Clang CFI
cfi: add __cficanonical
mm: add generic function_nocfi macro
module: ensure __cfi_check alignment
workqueue: use WARN_ON_FUNCTION_MISMATCH
kthread: use WARN_ON_FUNCTION_MISMATCH
kallsyms: strip ThinLTO hashes from static functions
bpf: disable CFI in dispatcher functions
treewide: Change list_sort to use const pointers
lkdtm: use function_nocfi
psci: use function_nocfi for cpu_resume
arm64: implement function_nocfi
arm64: use function_nocfi with __pa_symbol
arm64: add __nocfi to functions that jump to a physical address
arm64: add __nocfi to __apply_alternatives
KVM: arm64: Disable CFI for nVHE
arm64: allow CONFIG_CFI_CLANG to be selected
Makefile | 17 +
arch/Kconfig | 45 +++
arch/arm64/Kconfig | 1 +
arch/arm64/include/asm/memory.h | 15 +
arch/arm64/include/asm/mmu_context.h | 4 +-
arch/arm64/kernel/acpi_parking_protocol.c | 3 +-
arch/arm64/kernel/alternative.c | 4 +-
arch/arm64/kernel/cpu-reset.h | 10 +-
arch/arm64/kernel/cpufeature.c | 4 +-
arch/arm64/kernel/psci.c | 3 +-
arch/arm64/kernel/smp_spin_table.c | 3 +-
arch/arm64/kvm/hyp/nvhe/Makefile | 6 +-
arch/arm64/kvm/vgic/vgic-its.c | 8 +-
arch/arm64/kvm/vgic/vgic.c | 3 +-
block/blk-mq-sched.c | 3 +-
block/blk-mq.c | 3 +-
drivers/acpi/nfit/core.c | 3 +-
drivers/acpi/numa/hmat.c | 3 +-
drivers/clk/keystone/sci-clk.c | 4 +-
drivers/firmware/psci/psci.c | 7 +-
drivers/gpu/drm/drm_modes.c | 3 +-
drivers/gpu/drm/i915/gt/intel_engine_user.c | 3 +-
drivers/gpu/drm/i915/gvt/debugfs.c | 2 +-
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 3 +-
drivers/gpu/drm/radeon/radeon_cs.c | 4 +-
.../hw/usnic/usnic_uiom_interval_tree.c | 3 +-
drivers/interconnect/qcom/bcm-voter.c | 2 +-
drivers/md/raid5.c | 3 +-
drivers/misc/lkdtm/usercopy.c | 2 +-
drivers/misc/sram.c | 4 +-
drivers/nvme/host/core.c | 3 +-
.../controller/cadence/pcie-cadence-host.c | 3 +-
drivers/spi/spi-loopback-test.c | 3 +-
fs/btrfs/raid56.c | 3 +-
fs/btrfs/tree-log.c | 3 +-
fs/btrfs/volumes.c | 3 +-
fs/ext4/fsmap.c | 4 +-
fs/gfs2/glock.c | 3 +-
fs/gfs2/log.c | 2 +-
fs/gfs2/lops.c | 3 +-
fs/iomap/buffered-io.c | 3 +-
fs/ubifs/gc.c | 7 +-
fs/ubifs/replay.c | 4 +-
fs/xfs/scrub/bitmap.c | 4 +-
fs/xfs/xfs_bmap_item.c | 4 +-
fs/xfs/xfs_buf.c | 6 +-
fs/xfs/xfs_extent_busy.c | 4 +-
fs/xfs/xfs_extent_busy.h | 3 +-
fs/xfs/xfs_extfree_item.c | 4 +-
fs/xfs/xfs_refcount_item.c | 4 +-
fs/xfs/xfs_rmap_item.c | 4 +-
include/asm-generic/bug.h | 16 +
include/asm-generic/vmlinux.lds.h | 20 +-
include/linux/bpf.h | 4 +-
include/linux/cfi.h | 41 +++
include/linux/compiler-clang.h | 3 +
include/linux/compiler_types.h | 8 +
include/linux/init.h | 6 +-
include/linux/list_sort.h | 7 +-
include/linux/mm.h | 10 +
include/linux/module.h | 13 +-
include/linux/pci.h | 4 +-
init/Kconfig | 2 +-
kernel/Makefile | 4 +
kernel/cfi.c | 329 ++++++++++++++++++
kernel/kallsyms.c | 55 ++-
kernel/kthread.c | 3 +-
kernel/module.c | 43 +++
kernel/workqueue.c | 2 +-
lib/list_sort.c | 17 +-
lib/test_list_sort.c | 3 +-
net/tipc/name_table.c | 4 +-
scripts/Makefile.modfinal | 2 +-
scripts/module.lds.S | 20 +-
74 files changed, 759 insertions(+), 112 deletions(-)
create mode 100644 include/linux/cfi.h
create mode 100644 kernel/cfi.c
base-commit: d19cc4bfbff1ae72c3505a00fb8ce0d3fa519e6c
--
2.31.0.291.g576ba9dcdaf-goog
next reply other threads:[~2021-03-31 21:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 21:27 Sami Tolvanen [this message]
2021-03-31 21:27 ` [PATCH v4 01/17] add support for Clang CFI Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 02/17] cfi: add __cficanonical Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 03/17] mm: add generic function_nocfi macro Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 04/17] module: ensure __cfi_check alignment Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 05/17] workqueue: use WARN_ON_FUNCTION_MISMATCH Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 06/17] kthread: " Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 07/17] kallsyms: strip ThinLTO hashes from static functions Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 08/17] bpf: disable CFI in dispatcher functions Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 09/17] treewide: Change list_sort to use const pointers Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 10/17] lkdtm: use function_nocfi Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 11/17] psci: use function_nocfi for cpu_resume Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 12/17] arm64: implement function_nocfi Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 13/17] arm64: use function_nocfi with __pa_symbol Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 14/17] arm64: add __nocfi to functions that jump to a physical address Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 15/17] arm64: add __nocfi to __apply_alternatives Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 16/17] KVM: arm64: Disable CFI for nVHE Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 17/17] arm64: allow CONFIG_CFI_CLANG to be selected Sami Tolvanen
2021-03-31 21:46 ` [PATCH v4 00/17] Add support for Clang CFI 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=20210331212722.2746212-1-samitolvanen@google.com \
--to=samitolvanen@google.com \
--cc=arnd@arndb.de \
--cc=bpf@vger.kernel.org \
--cc=clang-built-linux@googlegroups.com \
--cc=hch@infradead.org \
--cc=jeyu@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=sedat.dilek@gmail.com \
--cc=tj@kernel.org \
--cc=will@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;
as well as URLs for NNTP newsgroup(s).