From: Nick Desaulniers <ndesaulniers@google.com>
To: Sami Tolvanen <samitolvanen@google.com>
Cc: x86@kernel.org, Kees Cook <keescook@chromium.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Nathan Chancellor <nathan@kernel.org>,
Sedat Dilek <sedat.dilek@gmail.com>,
linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org,
llvm@lists.linux.dev
Subject: Re: [PATCH v4 00/15] x86: Add support for Clang CFI
Date: Thu, 30 Sep 2021 11:38:43 -0700 [thread overview]
Message-ID: <CAKwvOdkmbW9dUqDiziC3mwRiJ5bGXr+wuOkJjeCwTddq_F9TAw@mail.gmail.com> (raw)
In-Reply-To: <20210930180531.1190642-1-samitolvanen@google.com>
On Thu, Sep 30, 2021 at 11:05 AM Sami Tolvanen <samitolvanen@google.com> wrote:
>
> This series adds support for Clang's Control-Flow Integrity (CFI)
> checking to x86_64. 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
>
> Note that v4 is based on tip/master. The first two patches contain
> objtool support for CFI, the remaining patches change function
> declarations to use opaque types, fix type mismatch issues that
> confuse the compiler, and disable CFI where it can't be used.
>
> You can also pull this series from
>
> https://github.com/samitolvanen/linux.git x86-cfi-v4
I tested this series with near ToT clang with CONFIG_LTO_CLANG_THIN=y
and our small buildroot-based userspace image in QEMU, then again with
CONFIG_LTO_CLANG_FULL=y. No new warnings from objtool, everything
seemed fine. FWIW,
Tested-by: Nick Desaulniers <ndesaulniers@google.com>
>
> ---
> Changes in v4:
> - Dropped the extable patch after the code was refactored in -tip.
>
> - Switched to __section() instead of open-coding the attribute.
>
> - Added an explicit ifdef for filtering out CC_FLAGS_CFI in
> purgatory for readability.
>
> - Added a comment to arch_cfi_jump_reloc_offset() in objtool.
>
> Changes in v3:
> - Dropped Clang requirement to >= 13 after the missing compiler
> fix was backported there.
>
> - Added DEFINE_CFI_IMMEDIATE_RETURN_STUB to address the issue
> with tp_stub_func in kernel/tracepoint.c.
>
> - Renamed asm_func_t to asm_func_ptr.
>
> - Changed extable handlers to use __cficanonical instead of
> disabling CFI for fixup_exception.
>
> Changes in v2:
> - Dropped the first objtool patch as the warnings were fixed in
> separate patches.
>
> - Changed fix_cfi_relocs() in objtool to not rely on jump table
> symbols, and to return an error if it can't find a relocation.
>
> - Fixed a build issue with ASM_STACK_FRAME_NON_STANDARD().
>
> - Dropped workarounds for inline assembly references to
> address-taken static functions with CFI as this was fixed in
> the compiler.
>
> - Changed the C declarations of non-callable functions to use
> opaque types and dropped the function_nocfi() patches.
>
> - Changed ARCH_SUPPORTS_CFI_CLANG to depend on Clang >=14 for
> the compiler fixes.
>
>
> Kees Cook (1):
> x86, relocs: Ignore __typeid__ relocations
>
> Sami Tolvanen (14):
> objtool: Add CONFIG_CFI_CLANG support
> objtool: Add ASM_STACK_FRAME_NON_STANDARD
> linkage: Add DECLARE_ASM_FUNC_SYMBOL
> cfi: Add DEFINE_CFI_IMMEDIATE_RETURN_STUB
> tracepoint: Exclude tp_stub_func from CFI checking
> ftrace: Use an opaque type for functions not callable from C
> lkdtm: Disable UNSET_SMEP with CFI
> lkdtm: Use an opaque type for lkdtm_rodata_do_nothing
> x86: Use an opaque type for functions not callable from C
> x86/purgatory: Disable CFI
> x86, module: Ignore __typeid__ relocations
> x86, cpu: Use LTO for cpu.c with CFI
> x86, kprobes: Fix optprobe_template_func type mismatch
> x86, build: Allow CONFIG_CFI_CLANG to be selected
>
> arch/x86/Kconfig | 1 +
> arch/x86/include/asm/ftrace.h | 2 +-
> arch/x86/include/asm/idtentry.h | 10 +++---
> arch/x86/include/asm/page_64.h | 7 ++--
> arch/x86/include/asm/paravirt_types.h | 3 +-
> arch/x86/include/asm/processor.h | 2 +-
> arch/x86/include/asm/proto.h | 25 ++++++-------
> arch/x86/include/asm/uaccess_64.h | 9 ++---
> arch/x86/kernel/alternative.c | 2 +-
> arch/x86/kernel/ftrace.c | 2 +-
> arch/x86/kernel/kprobes/opt.c | 4 +--
> arch/x86/kernel/module.c | 4 +++
> arch/x86/kernel/paravirt.c | 4 +--
> arch/x86/kvm/emulate.c | 4 +--
> arch/x86/kvm/kvm_emulate.h | 9 ++---
> arch/x86/power/Makefile | 2 ++
> arch/x86/purgatory/Makefile | 4 +++
> arch/x86/tools/relocs.c | 7 ++++
> arch/x86/xen/enlighten_pv.c | 6 ++--
> arch/x86/xen/xen-ops.h | 10 +++---
> drivers/misc/lkdtm/bugs.c | 2 +-
> drivers/misc/lkdtm/lkdtm.h | 2 +-
> drivers/misc/lkdtm/perms.c | 2 +-
> drivers/misc/lkdtm/rodata.c | 2 +-
> include/asm-generic/vmlinux.lds.h | 11 ++++++
> include/linux/cfi.h | 13 +++++++
> include/linux/ftrace.h | 7 ++--
> include/linux/linkage.h | 13 +++++++
> include/linux/objtool.h | 6 ++++
> kernel/cfi.c | 24 ++++++++++++-
> kernel/tracepoint.c | 5 +--
> tools/include/linux/objtool.h | 6 ++++
> tools/objtool/arch/x86/decode.c | 17 +++++++++
> tools/objtool/elf.c | 51 +++++++++++++++++++++++++++
> tools/objtool/include/objtool/arch.h | 3 ++
> tools/objtool/include/objtool/elf.h | 2 +-
> 36 files changed, 217 insertions(+), 66 deletions(-)
>
>
> base-commit: d4bfebd9ef497ee0afb498f6028a5074a6ccf307
> --
> 2.33.0.800.g4c38ced690-goog
>
--
Thanks,
~Nick Desaulniers
next prev parent reply other threads:[~2021-09-30 18:38 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-30 18:05 [PATCH v4 00/15] x86: Add support for Clang CFI Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 01/15] objtool: Add CONFIG_CFI_CLANG support Sami Tolvanen
2021-09-30 18:40 ` Nick Desaulniers
2021-10-06 3:36 ` Josh Poimboeuf
2021-10-06 16:18 ` Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 02/15] objtool: Add ASM_STACK_FRAME_NON_STANDARD Sami Tolvanen
2021-10-06 3:37 ` Josh Poimboeuf
2021-09-30 18:05 ` [PATCH v4 03/15] linkage: Add DECLARE_ASM_FUNC_SYMBOL Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 04/15] cfi: Add DEFINE_CFI_IMMEDIATE_RETURN_STUB Sami Tolvanen
2021-09-30 18:50 ` Nick Desaulniers
2021-10-01 20:07 ` Sami Tolvanen
2021-10-04 13:50 ` Peter Zijlstra
2021-10-04 19:10 ` Sami Tolvanen
2021-10-05 6:59 ` Peter Zijlstra
2021-10-05 20:29 ` Sami Tolvanen
2021-10-05 20:56 ` Peter Zijlstra
2021-10-05 21:53 ` Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 05/15] tracepoint: Exclude tp_stub_func from CFI checking Sami Tolvanen
2021-09-30 18:50 ` Nick Desaulniers
2021-10-01 20:08 ` Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 06/15] ftrace: Use an opaque type for functions not callable from C Sami Tolvanen
2021-10-06 3:29 ` Josh Poimboeuf
2021-10-06 13:02 ` Steven Rostedt
2021-10-06 13:54 ` Josh Poimboeuf
2021-10-06 14:16 ` Steven Rostedt
2021-10-06 16:31 ` Sami Tolvanen
2021-10-06 16:58 ` Steven Rostedt
2021-10-06 17:45 ` Sami Tolvanen
2021-10-06 20:43 ` Josh Poimboeuf
2021-10-06 21:10 ` Steven Rostedt
2021-10-06 21:23 ` Josh Poimboeuf
2021-10-06 23:14 ` Sami Tolvanen
2021-10-07 0:56 ` Steven Rostedt
2021-09-30 18:05 ` [PATCH v4 07/15] lkdtm: Disable UNSET_SMEP with CFI Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 08/15] lkdtm: Use an opaque type for lkdtm_rodata_do_nothing Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 09/15] x86: Use an opaque type for functions not callable from C Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 10/15] x86/purgatory: Disable CFI Sami Tolvanen
2021-09-30 19:05 ` Nick Desaulniers
2021-09-30 18:05 ` [PATCH v4 11/15] x86, relocs: Ignore __typeid__ relocations Sami Tolvanen
2021-10-06 3:31 ` Josh Poimboeuf
2021-10-06 16:17 ` Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 12/15] x86, module: " Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 13/15] x86, cpu: Use LTO for cpu.c with CFI Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 14/15] x86, kprobes: Fix optprobe_template_func type mismatch Sami Tolvanen
2021-09-30 18:05 ` [PATCH v4 15/15] x86, build: Allow CONFIG_CFI_CLANG to be selected Sami Tolvanen
2021-09-30 18:38 ` Nick Desaulniers [this message]
2021-10-05 20:36 ` [PATCH v4 00/15] x86: Add support for Clang CFI Josh Poimboeuf
2021-10-05 21:52 ` Sami Tolvanen
2021-10-06 2:42 ` Josh Poimboeuf
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=CAKwvOdkmbW9dUqDiziC3mwRiJ5bGXr+wuOkJjeCwTddq_F9TAw@mail.gmail.com \
--to=ndesaulniers@google.com \
--cc=jpoimboe@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=peterz@infradead.org \
--cc=samitolvanen@google.com \
--cc=sedat.dilek@gmail.com \
--cc=x86@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).