Control-flow Enforcement: Shadow Stack
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v30 Latest32 patches 1 replyIn review
- v2932 patches 18 repliesSuperseded
- v2832 patches 29 repliesSuperseded
Earlier versions · 28
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v27 | 31 patches | 15 replies | Superseded | |
| v26 | 30 patches | 52 replies | Superseded | |
| v25 | 30 patches | 12 replies | Superseded | |
| v24 | 30 patches | 19 replies | Superseded | |
| v23 | 28 patches | 37 replies | Superseded | |
| v22 | 28 patches | 1 reply | Superseded | |
| v21 | 26 patches | 17 replies | Superseded | |
| v20 | 25 patches | 13 replies | Superseded | |
| v19 | 25 patches | 41 replies | Superseded | |
| v18 | 25 patches | 23 replies | Superseded | |
| v17 | 26 patches | 31 replies | Superseded | |
| v16 | 26 patches | 4 replies | Superseded | |
| v15 | 26 patches | 33 replies | Superseded | |
| v14 posting 2/2 | 26 patches | 10 replies | Superseded | |
| v14 posting 1/2 | 19 of 26 patches | 1 reply | Superseded | |
| v13 | 26 patches | 4 replies | Superseded | |
| v12 | 26 patches | 0 replies | Superseded | |
| v11 | 25 patches | 65 replies | Superseded | |
| v10 | 26 patches | 44 replies | Superseded | |
| v9 RFC | 27 patches | 79 replies | Superseded | |
| v8 | 27 patches | 27 replies | Superseded | |
| v7 | 27 patches | 42 replies | Superseded | |
| v6 RFC | 26 patches | 14 replies | Superseded | |
| v5 | 27 patches | 52 replies | Superseded | |
| v4 RFC | 27 patches | 43 replies | Superseded | |
| v3 RFC | 24 patches | 48 replies | Superseded | |
| v2 RFC | 27 patches | 95 replies | Superseded | |
| v1 | 5 patches | 8 replies | Superseded |
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 files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/32 | Documentation/x86: Add CET descriptionDocumentation/ Documentation/ Documentation/ | +147 | 1 reply | |
| 2/32 | x86/cet/shstk: Add Kconfig option for Shadow Stackarch/ arch/ | +27 | 0 replies | |
| 3/32 | x86/cpufeatures: Add CET CPU feature flags for Control-flow Enforcement Technology (CET)arch/ arch/ arch/ | +11 | 0 replies | |
| 4/32 | x86/cpufeatures: Introduce CPU setup and option parsing for CETarch/ arch/ | +16 | 0 replies | |
| 5/32 | x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor statesarch/ arch/ arch/ +1 more | +55 | 0 replies | |
| 6/32 | x86/cet: Add control-protection fault handlerarch/ arch/ arch/ +2 more | +73 | 0 replies | |
| 7/32 | x86/mm: Remove _PAGE_DIRTY from kernel RO pagesarch/ arch/ | +4 | 0 replies | |
| 8/32 | x86/mm: Move pmd_write(), pud_write() up in the filearch/ | +12 | 0 replies | |
| 9/32 | x86/mm: Introduce _PAGE_COWarch/ arch/ | +217 | 0 replies | |
| 10/32 | drm/i915/gvt: Change _PAGE_DIRTY to _PAGE_DIRTY_BITSdrivers/ | +1 | 0 replies | |
| 11/32 | x86/mm: Update pte_modify for _PAGE_COWarch/ | +37 | 0 replies | |
| 12/32 | x86/mm: Update ptep_set_wrprotect() and pmdp_set_wrprotect() for transition from _PAGE_DIRTY to _PAGE_COWarch/ | +38 | 0 replies | |
| 13/32 | mm: Move VM_UFFD_MINOR_BIT from 37 to 38include/ | +1 | 0 replies | |
| 14/32 | mm: Introduce VM_SHADOW_STACK for shadow stack memoryDocumentation/ arch/ fs/ +1 more | +14 | 0 replies | |
| 15/32 | x86/mm: Check Shadow Stack page fault errorsarch/ arch/ | +21 | 0 replies | |
| 16/32 | x86/mm: Update maybe_mkwrite() for shadow stackarch/ arch/ include/ +1 more | +30 | 0 replies | |
| 17/32 | mm: Fixup places that call pte_mkwrite() directlymm/ mm/ mm/ +1 more | +5 | 0 replies | |
| 18/32 | mm: Add guard pages around a shadow stack.arch/ arch/ include/ | +57 | 0 replies | |
| 19/32 | mm/mmap: Add shadow stack pages to memory accountingarch/ arch/ include/ +1 more | +20 | 0 replies | |
| 20/32 | mm: Update can_follow_write_pte() for shadow stackmm/ mm/ | +24 | 0 replies | |
| 21/32 | mm/mprotect: Exclude shadow stack from preserve_writemm/ mm/ | +14 | 0 replies | |
| 22/32 | mm: Re-introduce vm_flags to do_mmap()fs/ include/ ipc/ +3 more | +12 | 0 replies | |
| 23/32 | x86/cet/shstk: Add user-mode shadow stack supportarch/ arch/ arch/ +1 more | +167 | 0 replies | |
| 24/32 | x86/process: Change copy_thread() argument 'arg' to 'stack_size'arch/ | +5 | 0 replies | |
| 25/32 | x86/cet/shstk: Handle thread shadow stackarch/ arch/ arch/ +1 more | +76 | 0 replies | |
| 26/32 | x86/cet/shstk: Introduce shadow stack token setup/verify routinesarch/ arch/ arch/ | +176 | 0 replies | |
| 27/32 | x86/cet/shstk: Handle signals for shadow stackarch/ arch/ arch/ +1 more | +79 | 0 replies | |
| 28/32 | ELF: Introduce arch_setup_elf_property()arch/ arch/ arch/ +4 more | +69 | 0 replies | |
| 29/32 | x86/cet/shstk: Add arch_prctl functions for shadow stackarch/ arch/ arch/ +2 more | +75 | 0 replies | |
| 30/32 | mm: Move arch_calc_vm_prot_bits() to arch/x86/include/asm/mman.harch/ arch/ | +33 | 0 replies | |
| 31/32 | mm: Update arch_validate_flags() to test vma anonymousarch/ arch/ include/ +2 more | +7 | 0 replies | |
| 32/32 | mm: Introduce PROT_SHADOW_STACK for shadow stackarch/ arch/ include/ | +62 | 0 replies |
Reviews trailers per patch
21 of 32 patches have a Reviewed-by or Acked-by.
| Patch | Kirill A. Shutemov | Axel Rasmussen | Kees Cook | Peter Collingbourne | Catalin Marinas |
|---|---|---|---|---|---|
| 1/32 | |||||
| 2/32 | |||||
| 3/32 | |||||
| 4/32 | |||||
| 5/32 | |||||
| 6/32 | |||||
| 7/32 | R-b | ||||
| 8/32 | R-b | ||||
| 9/32 | R-b | ||||
| 10/32 | R-b | R-b | |||
| 11/32 | R-b | ||||
| 12/32 | R-b | R-b | |||
| 13/32 | R-b | ||||
| 14/32 | R-b | ||||
| 15/32 | R-b | R-b | |||
| 16/32 | R-b | ||||
| 17/32 | R-b | ||||
| 18/32 | R-b | ||||
| 19/32 | R-b | ||||
| 20/32 | R-b | ||||
| 21/32 | R-b | ||||
| 22/32 | R-b | R-b | R-b | ||
| 23/32 | |||||
| 24/32 | |||||
| 25/32 | |||||
| 26/32 | |||||
| 27/32 | |||||
| 28/32 | A-b | ||||
| 29/32 | R-b | ||||
| 30/32 | R-b | R-b | |||
| 31/32 | R-b | A-b | |||
| 32/32 | R-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.
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