Skip to content

Control-flow Enforcement: Shadow Stack

Yu-cheng Yu linux-api linux-arch linux-doc linux-mm lkml 31 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v30 Latest32 patches 1 replyIn review
  2. v2932 patches 18 repliesSuperseded
  3. v2832 patches 29 repliesSuperseded
Earlier versions · 28
VersionPostedPatchesRepliesStatus
v2731 patches15 repliesSuperseded
v2630 patches52 repliesSuperseded
v2530 patches12 repliesSuperseded
v2430 patches19 repliesSuperseded
v2328 patches37 repliesSuperseded
v2228 patches1 replySuperseded
v2126 patches17 repliesSuperseded
v2025 patches13 repliesSuperseded
v1925 patches41 repliesSuperseded
v1825 patches23 repliesSuperseded
v1726 patches31 repliesSuperseded
v1626 patches4 repliesSuperseded
v1526 patches33 repliesSuperseded
v14 posting 2/226 patches10 repliesSuperseded
v14 posting 1/219 of 26 patches1 replySuperseded
v1326 patches4 repliesSuperseded
v1226 patches0 repliesSuperseded
v1125 patches65 repliesSuperseded
v1026 patches44 repliesSuperseded
v9 RFC27 patches79 repliesSuperseded
v827 patches27 repliesSuperseded
v727 patches42 repliesSuperseded
v6 RFC26 patches14 repliesSuperseded
v527 patches52 repliesSuperseded
v4 RFC27 patches43 repliesSuperseded
v3 RFC24 patches48 repliesSuperseded
v2 RFC27 patches95 repliesSuperseded
v15 patches8 repliesSuperseded

Changes in v30 from the cover letter

- Patch #12: Replace (pmdval_t) cast with CONFIG_PGTABLE_LEVELES > 2.
- Patch #15: Update Subject line and add a verb.
- Patch #23: Remove superfluous comments for struct thread_shstk. Replace 'populate' with 'unused'.
- Patch #25: Update comments about clone()/clone3().
- Patch #26: Update commit log and various comments. Remove variable init.

Patches in v30 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/32Documentation/x86: Add CET descriptionDocumentation/admin-guide/kernel-parameters.txt Documentation/x86/index.rst Documentation/x86/intel_cet.rst+147 -01 reply
2/32x86/cet/shstk: Add Kconfig option for Shadow Stackarch/x86/Kconfig arch/x86/Kconfig.assembler+27 -00 replies
3/32x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET)arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/disabled-features.h arch/x86/kernel/cpu/cpuid-deps.c+11 -10 replies
4/32x86/cpufeatures: Introduce CPU setup and option parsing for CETarch/x86/include/uapi/asm/processor-flags.h arch/x86/kernel/cpu/common.c+16 -00 replies
5/32x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor statesarch/x86/include/asm/fpu/types.h arch/x86/include/asm/fpu/xstate.h arch/x86/include/asm/msr-index.h +1 more+55 -50 replies
6/32x86/cet: Add control-protection fault handlerarch/x86/include/asm/idtentry.h arch/x86/kernel/idt.c arch/x86/kernel/signal_compat.c +2 more+73 -20 replies
7/32x86/mm: Remove _PAGE_DIRTY from kernel RO pagesarch/x86/include/asm/pgtable_types.h arch/x86/mm/pat/set_memory.c+4 -40 replies
8/32x86/mm: Move pmd_write(), pud_write() up in the filearch/x86/include/asm/pgtable.h+12 -120 replies
9/32x86/mm: Introduce _PAGE_COWarch/x86/include/asm/pgtable.h arch/x86/include/asm/pgtable_types.h+217 -210 replies
10/32drm/i915/gvt: Change _PAGE_DIRTY to _PAGE_DIRTY_BITSdrivers/gpu/drm/i915/gvt/gtt.c+1 -10 replies
11/32x86/mm: Update pte_modify for _PAGE_COWarch/x86/include/asm/pgtable.h+37 -00 replies
12/32x86/mm: Update ptep_set_wrprotect() and pmdp_set_wrprotect() for transition from _PAGE_DIRTY to _PAGE_COWarch/x86/include/asm/pgtable.h+38 -00 replies
13/32mm: Move VM_UFFD_MINOR_BIT from 37 to 38include/linux/mm.h+1 -10 replies
14/32mm: Introduce VM_SHADOW_STACK for shadow stack memoryDocumentation/filesystems/proc.rst arch/x86/mm/mmap.c fs/proc/task_mmu.c +1 more+14 -00 replies
15/32x86/mm: Check Shadow Stack page fault errorsarch/x86/include/asm/trap_pf.h arch/x86/mm/fault.c+21 -00 replies
16/32x86/mm: Update maybe_mkwrite() for shadow stackarch/x86/include/asm/pgtable.h arch/x86/mm/pgtable.c include/linux/mm.h +1 more+30 -00 replies
17/32mm: Fixup places that call pte_mkwrite() directlymm/huge_memory.c mm/memory.c mm/migrate.c +1 more+5 -70 replies
18/32mm: Add guard pages around a shadow stack.arch/x86/include/asm/page_types.h arch/x86/mm/mmap.c include/linux/mm.h+57 -00 replies
19/32mm/mmap: Add shadow stack pages to memory accountingarch/x86/include/asm/pgtable.h arch/x86/mm/pgtable.c include/linux/pgtable.h +1 more+20 -00 replies
20/32mm: Update can_follow_write_pte() for shadow stackmm/gup.c mm/huge_memory.c+24 -80 replies
21/32mm/mprotect: Exclude shadow stack from preserve_writemm/huge_memory.c mm/mprotect.c+14 -00 replies
22/32mm: Re-introduce vm_flags to do_mmap()fs/aio.c include/linux/mm.h ipc/shm.c +3 more+12 -110 replies
23/32x86/cet/shstk: Add user-mode shadow stack supportarch/x86/include/asm/cet.h arch/x86/include/asm/processor.h arch/x86/kernel/Makefile +1 more+167 -00 replies
24/32x86/process: Change copy_thread() argument 'arg' to 'stack_size'arch/x86/kernel/process.c+5 -40 replies
25/32x86/cet/shstk: Handle thread shadow stackarch/x86/include/asm/cet.h arch/x86/include/asm/mmu_context.h arch/x86/kernel/process.c +1 more+76 -10 replies
26/32x86/cet/shstk: Introduce shadow stack token setup/verify routinesarch/x86/include/asm/cet.h arch/x86/include/asm/special_insns.h arch/x86/kernel/shstk.c+176 -00 replies
27/32x86/cet/shstk: Handle signals for shadow stackarch/x86/ia32/ia32_signal.c arch/x86/include/asm/cet.h arch/x86/kernel/shstk.c +1 more+79 -50 replies
28/32ELF: Introduce arch_setup_elf_property()arch/arm64/include/asm/elf.h arch/x86/Kconfig arch/x86/include/asm/elf.h +4 more+69 -00 replies
29/32x86/cet/shstk: Add arch_prctl functions for shadow stackarch/x86/include/asm/cet.h arch/x86/include/uapi/asm/prctl.h arch/x86/kernel/Makefile +2 more+75 -30 replies
30/32mm: Move arch_calc_vm_prot_bits() to arch/x86/include/asm/mman.harch/x86/include/asm/mman.h arch/x86/include/uapi/asm/mman.h+33 -250 replies
31/32mm: Update arch_validate_flags() to test vma anonymousarch/arm64/include/asm/mman.h arch/sparc/include/asm/mman.h include/linux/mman.h +2 more+7 -70 replies
32/32mm: Introduce PROT_SHADOW_STACK for shadow stackarch/x86/include/asm/mman.h arch/x86/include/uapi/asm/mman.h include/linux/mm.h+62 -10 replies

Reviews trailers per patch

21 of 32 patches have a Reviewed-by or Acked-by.

PatchKirill A. ShutemovAxel RasmussenKees CookPeter CollingbourneCatalin Marinas
1/32
2/32
3/32
4/32
5/32
6/32
7/32R-b
8/32R-b
9/32R-b
10/32R-b R-b
11/32R-b
12/32R-b R-b
13/32R-b
14/32R-b
15/32R-b R-b
16/32R-b
17/32R-b
18/32R-b
19/32R-b
20/32R-b
21/32R-b
22/32R-b R-b R-b
23/32
24/32
25/32
26/32
27/32
28/32A-b
29/32R-b
30/32R-b R-b
31/32R-b A-b
32/32R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v30 thread

Cover letter [PATCH v30 00/32] Control-flow Enforcement: Shadow Stack

Control-flow Enforcement (CET) is a new Intel processor feature that blocks return/jump-oriented programming attacks. Details are in "Intel 64 and IA-32 Architectures Software Developer's Manual" [1].

CET can protect applications and the kernel. This series enables only application-level protection, and is further split into the Shadow Stack and Indirect Branch Tracking.

Linux distributions with CET are available now. The patches being sent are regularly applied to upstream Linus tree and tested by Zero-day service and verified in all configurations of GLIBC tests. In addition, Linux kernel selftests/x86 has been updated and run with CET enabled. Selftests patches v2 will be sent separately [2].

Changes in v30:
- Patch #12: Replace (pmdval_t) cast with CONFIG_PGTABLE_LEVELES > 2.
- Patch #15: Update Subject line and add a verb.
- Patch #23: Remove superfluous comments for struct thread_shstk. Replace 'populate' with 'unused'.
- Patch #25: Update comments about clone()/clone3().
- Patch #26: Update commit log and various comments. Remove variable init.

	     Replace 'ia32' with 'proc32'.

- Rebase to Linus tree v5.14.

Changes in v29:
- Patch #5: Move CET MSR definitions up in msr-index.h.
- Patch #6: Remove pr_emerg() from CP fault handler, since that is followed by die().
- Patch #16: Remove likely().
- Patch #25: Add WARN_ON_ONCE() when get_xsave_addr() returns NULL (Dave Hansen).
- Rebased to Linus tree v5.14-rc6.

Changes in v28:
- Patch #1: Update Document to indicate no-user-shstk also disables IBT.
- Patch #23: Update shstk_setup() with wrmsrl_safe(). Update return value.
- Patch #25: Split out copy_thread() changes. Add support for old clone(). Add comments.
- Add comments for get_xsave_addr() (Patch #25, #26).
- Rebase to Linus tree v5.14-rc2.

Changes in v27:
- Eliminate signal context extension structure. Simplify signal handling.
- Add a new patch to move VM_UFFD_MINOR_BIT to 38.
- Smaller changes are in each patch's log.
- Rebase to Linus tree v5.13-rc2.

[1] Intel 64 and IA-32 Architectures Software Developer's Manual:

    https://software.intel.com/en-us/download/intel-64-and-ia-32-
    architectures-sdm-combined-volumes-1-2a-2b-2c-2d-3a-3b-3c-3d-and-4

[2] Selftests patches v1:

    https://lkml.kernel.org/r/[email protected]/

Yu-cheng Yu (32):
Documentation/x86: Add CET description
x86/cet/shstk: Add Kconfig option for Shadow Stack x86/cpufeatures: Add CET CPU feature flags for Control-flow
Enforcement Technology (CET)
x86/cpufeatures: Introduce CPU setup and option parsing for CET x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor states x86/cet: Add control-protection fault handler
x86/mm: Remove _PAGE_DIRTY from kernel RO pages x86/mm: Move pmd_write(), pud_write() up in the file x86/mm: Introduce _PAGE_COW
drm/i915/gvt: Change _PAGE_DIRTY to _PAGE_DIRTY_BITS x86/mm: Update pte_modify for _PAGE_COW
x86/mm: Update ptep_set_wrprotect() and pmdp_set_wrprotect() for
transition from _PAGE_DIRTY to _PAGE_COW
mm: Move VM_UFFD_MINOR_BIT from 37 to 38
mm: Introduce VM_SHADOW_STACK for shadow stack memory x86/mm: Check Shadow Stack page fault errors
x86/mm: Update maybe_mkwrite() for shadow stack
mm: Fixup places that call pte_mkwrite() directly
mm: Add guard pages around a shadow stack.
mm/mmap: Add shadow stack pages to memory accounting
mm: Update can_follow_write_pte() for shadow stack mm/mprotect: Exclude shadow stack from preserve_write
mm: Re-introduce vm_flags to do_mmap()
x86/cet/shstk: Add user-mode shadow stack support x86/process: Change copy_thread() argument 'arg' to 'stack_size' x86/cet/shstk: Handle thread shadow stack x86/cet/shstk: Introduce shadow stack token setup/verify routines x86/cet/shstk: Handle signals for shadow stack
ELF: Introduce arch_setup_elf_property() x86/cet/shstk: Add arch_prctl functions for shadow stack
mm: Move arch_calc_vm_prot_bits() to arch/x86/include/asm/mman.h
mm: Update arch_validate_flags() to test vma anonymous
mm: Introduce PROT_SHADOW_STACK for shadow stack

 .../admin-guide/kernel-parameters.txt         |   7 +
 Documentation/filesystems/proc.rst            |   1 +
 Documentation/x86/index.rst                   |   1 +
 Documentation/x86/intel_cet.rst               | 139 +++++++
 arch/arm64/include/asm/elf.h                  |   5 +
 arch/arm64/include/asm/mman.h                 |   4 +-
 arch/sparc/include/asm/mman.h                 |   4 +-
 arch/x86/Kconfig                              |  24 ++
 arch/x86/Kconfig.assembler                    |   5 +
 arch/x86/ia32/ia32_signal.c                   |  25 +-
 arch/x86/include/asm/cet.h                    |  50 +++
 arch/x86/include/asm/cpufeatures.h            |   2 +
 arch/x86/include/asm/disabled-features.h      |   8 +-
 arch/x86/include/asm/elf.h                    |  11 +
 arch/x86/include/asm/fpu/types.h              |  23 +-
 arch/x86/include/asm/fpu/xstate.h             |   6 +-
 arch/x86/include/asm/idtentry.h               |   4 +
 arch/x86/include/asm/mman.h                   |  88 ++++
 arch/x86/include/asm/mmu_context.h            |   3 +
 arch/x86/include/asm/msr-index.h              |  20 +
 arch/x86/include/asm/page_types.h             |   7 +
 arch/x86/include/asm/pgtable.h                | 302 ++++++++++++--
 arch/x86/include/asm/pgtable_types.h          |  48 ++-
 arch/x86/include/asm/processor.h              |   5 +
 arch/x86/include/asm/special_insns.h          |  30 ++
 arch/x86/include/asm/trap_pf.h                |   2 +
 arch/x86/include/uapi/asm/mman.h              |  28 +-
 arch/x86/include/uapi/asm/prctl.h             |   4 +
 arch/x86/include/uapi/asm/processor-flags.h   |   2 +
 arch/x86/kernel/Makefile                      |   2 +
 arch/x86/kernel/cet_prctl.c                   |  60 +++
 arch/x86/kernel/cpu/common.c                  |  14 +
 arch/x86/kernel/cpu/cpuid-deps.c              |   2 +
 arch/x86/kernel/fpu/xstate.c                  |  11 +-
 arch/x86/kernel/idt.c                         |   4 +
 arch/x86/kernel/process.c                     |  21 +-
 arch/x86/kernel/process_64.c                  |  27 ++
 arch/x86/kernel/shstk.c                       | 376 ++++++++++++++++++
 arch/x86/kernel/signal.c                      |  13 +
 arch/x86/kernel/signal_compat.c               |   2 +-
 arch/x86/kernel/traps.c                       |  62 +++
 arch/x86/mm/fault.c                           |  19 +
 arch/x86/mm/mmap.c                            |  48 +++
 arch/x86/mm/pat/set_memory.c                  |   2 +-
 arch/x86/mm/pgtable.c                         |  25 ++
 drivers/gpu/drm/i915/gvt/gtt.c                |   2 +-
 fs/aio.c                                      |   2 +-
 fs/binfmt_elf.c                               |   4 +
 fs/proc/task_mmu.c                            |   3 +
 include/linux/elf.h                           |   6 +
 include/linux/mm.h                            |  20 +-
 include/linux/mman.h                          |   2 +-
 include/linux/pgtable.h                       |   7 +
 include/uapi/asm-generic/siginfo.h            |   3 +-
 include/uapi/linux/elf.h                      |  14 +
 ipc/shm.c                                     |   2 +-
 mm/gup.c                                      |  16 +-
 mm/huge_memory.c                              |  27 +-
 mm/memory.c                                   |   5 +-
 mm/migrate.c                                  |   3 +-
 mm/mmap.c                                     |  17 +-
 mm/mprotect.c                                 |  11 +-
 mm/nommu.c                                    |   4 +-
 mm/util.c                                     |   2 +-
 64 files changed, 1581 insertions(+), 115 deletions(-)
 create mode 100644 Documentation/x86/intel_cet.rst
 create mode 100644 arch/x86/include/asm/cet.h
 create mode 100644 arch/x86/include/asm/mman.h
 create mode 100644 arch/x86/kernel/cet_prctl.c
 create mode 100644 arch/x86/kernel/shstk.c
Signature · 1 line
2.21.0