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>, 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, Sami Tolvanen <samitolvanen@google.com> Subject: [PATCH 00/17] Add support for Clang CFI Date: Thu, 11 Mar 2021 16:49:02 -0800 [thread overview] Message-ID: <20210312004919.669614-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-v1 Sami Tolvanen (17): add support for Clang CFI cfi: add __cficanonical mm: add generic __va_function and __pa_function macros module: cfi: ensure __cfi_check alignment workqueue: cfi: disable callback pointer check with modules kthread: cfi: disable callback pointer check with modules kallsyms: cfi: strip hashes from static functions bpf: disable CFI in dispatcher functions lib/list_sort: fix function type mismatches lkdtm: use __va_function psci: use __pa_function for cpu_resume arm64: implement __va_function arm64: use __pa_function 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 | 2 +- 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 | 2 +- arch/arm64/kvm/hyp/nvhe/Makefile | 6 +- drivers/firmware/psci/psci.c | 4 +- drivers/misc/lkdtm/usercopy.c | 2 +- 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/mm.h | 8 + include/linux/module.h | 13 +- include/linux/pci.h | 4 +- init/Kconfig | 2 +- kernel/Makefile | 4 + kernel/cfi.c | 329 ++++++++++++++++++++++ kernel/kallsyms.c | 54 +++- kernel/kthread.c | 8 +- kernel/module.c | 43 +++ kernel/workqueue.c | 9 +- lib/list_sort.c | 8 +- scripts/Makefile.modfinal | 2 +- scripts/module.lds.S | 14 +- 33 files changed, 655 insertions(+), 44 deletions(-) create mode 100644 include/linux/cfi.h create mode 100644 kernel/cfi.c base-commit: 28806e4d9b97865b450d72156e9ad229f2067f0b -- 2.31.0.rc2.261.g7f71774620-goog
WARNING: multiple messages have this Message-ID (diff)
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>, 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, Sami Tolvanen <samitolvanen@google.com> Subject: [PATCH 00/17] Add support for Clang CFI Date: Thu, 11 Mar 2021 16:49:02 -0800 [thread overview] Message-ID: <20210312004919.669614-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-v1 Sami Tolvanen (17): add support for Clang CFI cfi: add __cficanonical mm: add generic __va_function and __pa_function macros module: cfi: ensure __cfi_check alignment workqueue: cfi: disable callback pointer check with modules kthread: cfi: disable callback pointer check with modules kallsyms: cfi: strip hashes from static functions bpf: disable CFI in dispatcher functions lib/list_sort: fix function type mismatches lkdtm: use __va_function psci: use __pa_function for cpu_resume arm64: implement __va_function arm64: use __pa_function 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 | 2 +- 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 | 2 +- arch/arm64/kvm/hyp/nvhe/Makefile | 6 +- drivers/firmware/psci/psci.c | 4 +- drivers/misc/lkdtm/usercopy.c | 2 +- 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/mm.h | 8 + include/linux/module.h | 13 +- include/linux/pci.h | 4 +- init/Kconfig | 2 +- kernel/Makefile | 4 + kernel/cfi.c | 329 ++++++++++++++++++++++ kernel/kallsyms.c | 54 +++- kernel/kthread.c | 8 +- kernel/module.c | 43 +++ kernel/workqueue.c | 9 +- lib/list_sort.c | 8 +- scripts/Makefile.modfinal | 2 +- scripts/module.lds.S | 14 +- 33 files changed, 655 insertions(+), 44 deletions(-) create mode 100644 include/linux/cfi.h create mode 100644 kernel/cfi.c base-commit: 28806e4d9b97865b450d72156e9ad229f2067f0b -- 2.31.0.rc2.261.g7f71774620-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2021-03-12 0:50 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-12 0:49 Sami Tolvanen [this message] 2021-03-12 0:49 ` [PATCH 00/17] Add support for Clang CFI Sami Tolvanen 2021-03-12 0:49 ` [PATCH 01/17] add " Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:39 ` Kees Cook 2021-03-12 2:39 ` Kees Cook 2021-03-12 0:49 ` [PATCH 02/17] cfi: add __cficanonical Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:40 ` Kees Cook 2021-03-12 2:40 ` Kees Cook 2021-03-12 20:28 ` Bjorn Helgaas 2021-03-12 20:28 ` Bjorn Helgaas 2021-03-12 0:49 ` [PATCH 03/17] mm: add generic __va_function and __pa_function macros Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:40 ` Kees Cook 2021-03-12 2:40 ` Kees Cook 2021-03-12 0:49 ` [PATCH 04/17] module: cfi: ensure __cfi_check alignment Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:39 ` Kees Cook 2021-03-12 2:39 ` Kees Cook 2021-03-16 20:03 ` Sami Tolvanen 2021-03-16 20:03 ` Sami Tolvanen 2021-03-12 0:49 ` [PATCH 05/17] workqueue: cfi: disable callback pointer check with modules Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:43 ` Kees Cook 2021-03-12 2:43 ` Kees Cook 2021-03-12 0:49 ` [PATCH 06/17] kthread: " Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:43 ` Kees Cook 2021-03-12 2:43 ` Kees Cook 2021-03-12 6:13 ` Christoph Hellwig 2021-03-12 6:13 ` Christoph Hellwig 2021-03-17 16:05 ` Sami Tolvanen 2021-03-17 16:05 ` Sami Tolvanen 2021-03-12 0:49 ` [PATCH 07/17] kallsyms: cfi: strip hashes from static functions Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:45 ` Kees Cook 2021-03-12 2:45 ` Kees Cook 2021-03-16 20:33 ` Sami Tolvanen 2021-03-16 20:33 ` Sami Tolvanen 2021-03-12 0:49 ` [PATCH 08/17] bpf: disable CFI in dispatcher functions Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:45 ` Kees Cook 2021-03-12 2:45 ` Kees Cook 2021-03-12 0:49 ` [PATCH 09/17] lib/list_sort: fix function type mismatches Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:45 ` Kees Cook 2021-03-12 2:45 ` Kees Cook 2021-03-12 0:49 ` [PATCH 10/17] lkdtm: use __va_function Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:45 ` Kees Cook 2021-03-12 2:45 ` Kees Cook 2021-03-12 0:49 ` [PATCH 11/17] psci: use __pa_function for cpu_resume Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:45 ` Kees Cook 2021-03-12 2:45 ` Kees Cook 2021-03-12 0:49 ` [PATCH 12/17] arm64: implement __va_function Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:46 ` Kees Cook 2021-03-12 2:46 ` Kees Cook 2021-03-12 0:49 ` [PATCH 13/17] arm64: use __pa_function Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:46 ` Kees Cook 2021-03-12 2:46 ` Kees Cook 2021-03-12 0:49 ` [PATCH 14/17] arm64: add __nocfi to functions that jump to a physical address Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:47 ` Kees Cook 2021-03-12 2:47 ` Kees Cook 2021-03-12 0:49 ` [PATCH 15/17] arm64: add __nocfi to __apply_alternatives Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:50 ` Kees Cook 2021-03-12 2:50 ` Kees Cook 2021-03-12 0:49 ` [PATCH 16/17] KVM: arm64: Disable CFI for nVHE Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:50 ` Kees Cook 2021-03-12 2:50 ` Kees Cook 2021-03-12 0:49 ` [PATCH 17/17] arm64: allow CONFIG_CFI_CLANG to be selected Sami Tolvanen 2021-03-12 0:49 ` Sami Tolvanen 2021-03-12 2:51 ` Kees Cook 2021-03-12 2:51 ` Kees Cook 2021-03-16 20:44 ` Sami Tolvanen 2021-03-16 20:44 ` Sami Tolvanen 2021-03-16 23:02 ` Kees Cook 2021-03-16 23:02 ` 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=20210312004919.669614-1-samitolvanen@google.com \ --to=samitolvanen@google.com \ --cc=arnd@arndb.de \ --cc=bpf@vger.kernel.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=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: linkBe 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.