Control-flow Enforcement: Branch Tracking, PTRACE
Subsystems (11)
v6 cover Control-flow Enforcement: Branch Tracking, PTRACE
The previous version of CET Branch Tracking/PTRACE patches is at the following link:
https://lkml.org/lkml/2018/10/11/662
Summary of changes from v5:
Remove the legacy code bitmap allocation from kernel. Now GLIBC allocates the bitmap and passes it to the kernel.
Some small fixes.
H.J. Lu (3):
x86: Insert endbr32/endbr64 to vDSO x86/vsyscall/32: Add ENDBR32 to vsyscall entry point x86/vsyscall/64: Add ENDBR64 to vsyscall entry points
Yu-cheng Yu (8):
x86/cet/ibt: Add Kconfig option for user-mode Indirect Branch Tracking x86/cet/ibt: User-mode indirect branch tracking support x86/cet/ibt: Add IBT legacy code bitmap setup function mm/mmap: Add IBT bitmap size to address space limit check x86/cet/ibt: ELF header parsing for IBT
x86/cet/ibt: Add arch_prctl functions for IBT
x86/cet/ibt: Add ENDBR to op-code-map
x86/cet: Add PTRACE interface for CET
arch/x86/Kconfig | 16 ++++++ arch/x86/Makefile | 7 +++ arch/x86/entry/vdso/.gitignore | 4 ++ arch/x86/entry/vdso/Makefile | 12 ++++- arch/x86/entry/vdso/vdso-layout.lds.S | 1 + arch/x86/entry/vdso/vdso32/system_call.S | 3 ++ arch/x86/entry/vsyscall/vsyscall_emu_64.S | 9 ++++ arch/x86/include/asm/cet.h | 8 +++ arch/x86/include/asm/disabled-features.h | 8 ++- arch/x86/include/asm/fpu/regset.h | 7 +-- arch/x86/include/asm/mmu_context.h | 10 ++++ arch/x86/include/uapi/asm/elf_property.h | 1 + arch/x86/include/uapi/asm/prctl.h | 2 + arch/x86/kernel/cet.c | 54 +++++++++++++++++++ arch/x86/kernel/cet_prctl.c | 21 ++++++++ arch/x86/kernel/cpu/common.c | 17 ++++++ arch/x86/kernel/elf.c | 5 ++ arch/x86/kernel/fpu/regset.c | 41 ++++++++++++++ arch/x86/kernel/process.c | 1 + arch/x86/kernel/ptrace.c | 16 ++++++ arch/x86/lib/x86-opcode-map.txt | 13 ++++- include/uapi/linux/elf.h | 1 + mm/mmap.c | 19 ++++++- .../arch/x86/include/asm/disabled-features.h | 8 ++- tools/objtool/arch/x86/lib/x86-opcode-map.txt | 13 ++++- 25 files changed, 286 insertions(+), 11 deletions(-)
Signature · 1 line
2.17.1
RFC PATCH v6 1/11 x86/cet/ibt: Add Kconfig option for user-mode Indirect Branch Tracking
The user-mode indirect branch tracking support is done mostly by GCC to insert ENDBR64/ENDBR32 instructions at branch targets. The kernel provides CPUID enumeration and feature setup.
--- arch/x86/Kconfig | 16 ++++++++++++++++ arch/x86/Makefile | 7 +++++++ 2 files changed, 23 insertions(+)
arch/x86/Kconfig +16 -0
@@ -1925,6 +1925,9 @@ config X86_INTEL_CET config ARCH_HAS_SHSTK def_bool n +config ARCH_HAS_AS_LIMIT + def_bool n + config ARCH_HAS_PROGRAM_PROPERTIES def_bool n
@@ -1948,6 +1951,19 @@ config X86_INTEL_SHADOW_STACK_USER If unsure, say y. +config X86_INTEL_BRANCH_TRACKING_USER + prompt "Intel Indirect Branch Tracking for user-mode" + def_bool n + depends on CPU_SUP_INTEL && X86_64 + select X86_INTEL_CET + select ARCH_HAS_AS_LIMIT + select ARCH_HAS_PROGRAM_PROPERTIES + ---help--- + Indirect Branch Tracking provides hardware protection against return-/jmp- + oriented programming attacks. + + If unsure, say y + config EFI bool "EFI runtime service support" depends on ACPI
arch/x86/Makefile +7 -0
@@ -159,6 +159,13 @@ ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER endif endif +# Check compiler ibt support +ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + ifeq ($(call cc-option-yn, -fcf-protection=branch), n) + $(error CONFIG_X86_INTEL_BRANCH_TRACKING_USER not supported by compiler) + endif +endif + # # If the function graph tracer is used with mcount instead of fentry, # '-maccumulate-outgoing-args' is needed to prevent a GCC bug
Signature · 1 line
2.17.1
RFC PATCH v6 2/11 x86/cet/ibt: User-mode indirect branch tracking support
In reply to Yu-cheng YuAdd user-mode indirect branch tracking enabling/disabling and supporting routines.
--- arch/x86/include/asm/cet.h | 7 +++++ arch/x86/include/asm/disabled-features.h | 8 ++++- arch/x86/kernel/cet.c | 31 +++++++++++++++++++ arch/x86/kernel/cpu/common.c | 17 ++++++++++ arch/x86/kernel/process.c | 1 + .../arch/x86/include/asm/disabled-features.h | 8 ++++- 6 files changed, 70 insertions(+), 2 deletions(-)
arch/x86/include/asm/cet.h +7 -0
@@ -12,8 +12,11 @@ struct task_struct;struct cet_status {unsigned long shstk_base;unsigned long shstk_size; +unsigned long ibt_bitmap_addr; +unsigned long ibt_bitmap_size;unsigned int locked:1 ;unsigned int shstk_enabled:1 ; +unsigned int ibt_enabled:1 ; };#ifdef CONFIG_X86_INTEL_CET
@@ -25,6 +28,8 @@ void cet_disable_shstk(void);void cet_disable_free_shstk (struct task_struct *p);int cet_restore_signal (unsigned long ssp);int cet_setup_signal (bool ia32,unsigned long rstor,unsigned long *new_ssp); +int cet_setup_ibt (void ); +void cet_disable_ibt (void );#else static inline int prctl_cet (int option,unsigned long arg2) {return -EINVAL ; }static inline int cet_setup_shstk (void ) {return -EINVAL ; }
@@ -35,6 +40,8 @@ static inline void cet_disable_free_shstk(struct task_struct *p) {}static inline int cet_restore_signal (unsigned long ssp) {return -EINVAL ; }static inline int cet_setup_signal (bool ia32,unsigned long rstor,unsigned long *new_ssp) {return -EINVAL ; } +static inline int cet_setup_ibt (void ) {return -EINVAL ; } +static inline void cet_disable_ibt (void ) {}#endif #define cpu_x86_cet_enabled () \
arch/x86/include/asm/disabled-features.h +7 -1
@@ -62,6 +62,12 @@#define DISABLE_SHSTK (1<<(X86_FEATURE_SHSTK & 31))#endif +#ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER +#define DISABLE_IBT 0 +#else +#define DISABLE_IBT (1<<(X86_FEATURE_IBT & 31)) +#endif +/* * Make sure to add features to the correct mask */
@@ -72,7 +78,7 @@#define DISABLED_MASK4 (DISABLE_PCID)#define DISABLED_MASK5 0#define DISABLED_MASK6 0 -#define DISABLED_MASK7 (DISABLE_PTI) +#define DISABLED_MASK7 (DISABLE_PTI|DISABLE_IBT)#define DISABLED_MASK8 0#define DISABLED_MASK9 (DISABLE_MPX)#define DISABLED_MASK10 0
arch/x86/kernel/cet.c +31 -0
@@ -13,6 +13,8 @@#include <linux/uaccess.h> #include <linux/sched/signal.h> #include <linux/compat.h> +#include <linux/vmalloc.h> +#include <linux/bitops.h> #include <asm/msr.h> #include <asm/user.h> #include <asm/fpu/xstate.h>
@@ -302,3 +304,32 @@ int cet_setup_signal(bool ia32, unsigned long rstor_addr,set_shstk_ptr (ssp);return 0 ; } + +int cet_setup_ibt (void ) +{ +u64 r; + +if (!cpu_feature_enabled (X86_FEATURE_IBT )) +return -EOPNOTSUPP ; + +rdmsrl (MSR_IA32_U_CET , r); + r |= (MSR_IA32_CET_ENDBR_EN |MSR_IA32_CET_NO_TRACK_EN ); +wrmsrl (MSR_IA32_U_CET , r); + + current->thread.cet.ibt_enabled =1 ; +return 0 ; +} + +void cet_disable_ibt (void ) +{ +u64 r; + +if (!cpu_feature_enabled (X86_FEATURE_IBT )) +return ; + +rdmsrl (MSR_IA32_U_CET , r); + r &= ~(MSR_IA32_CET_ENDBR_EN |MSR_IA32_CET_LEG_IW_EN | +MSR_IA32_CET_NO_TRACK_EN |MSR_IA32_CET_BITMAP_MASK ); +wrmsrl (MSR_IA32_U_CET , r); + current->thread.cet.ibt_enabled =0 ; +}
arch/x86/kernel/cpu/common.c +17 -0
@@ -435,6 +435,23 @@ static __init int setup_disable_shstk(char *s)__setup ("no_cet_shstk" , setup_disable_shstk);#endif +#ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER +static __init int setup_disable_ibt (char *s) +{ +/* require an exact match without trailing characters */ +if (s[0 ] !='\0' ) +return 0 ; + +if (!boot_cpu_has (X86_FEATURE_IBT )) +return 1 ; + +setup_clear_cpu_cap (X86_FEATURE_IBT ); +pr_info ("x86: 'no_cet_ibt' specified, disabling Branch Tracking\n" ); +return 1 ; +} +__setup ("no_cet_ibt" , setup_disable_ibt); +#endif +/* * Some CPU features depend on higher CPUID levels, which may not always * be available due to CPUID level capping or broken virtualization
arch/x86/kernel/process.c +1 -0
@@ -137,6 +137,7 @@ void flush_thread(void)memset (tsk->thread.tls_array,0 ,sizeof (tsk->thread.tls_array));cet_disable_shstk (); +cet_disable_ibt ();fpu__clear (&tsk->thread.fpu); }
tools/arch/x86/include/asm/disabled-features.h +7 -1
@@ -62,6 +62,12 @@#define DISABLE_SHSTK (1<<(X86_FEATURE_SHSTK & 31))#endif +#ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER +#define DISABLE_IBT 0 +#else +#define DISABLE_IBT (1<<(X86_FEATURE_IBT & 31)) +#endif +/* * Make sure to add features to the correct mask */
@@ -72,7 +78,7 @@#define DISABLED_MASK4 (DISABLE_PCID)#define DISABLED_MASK5 0#define DISABLED_MASK6 0 -#define DISABLED_MASK7 (DISABLE_PTI) +#define DISABLED_MASK7 (DISABLE_PTI|DISABLE_IBT)#define DISABLED_MASK8 0#define DISABLED_MASK9 (DISABLE_MPX)#define DISABLED_MASK10 0
Signature · 1 line
2.17.1
RFC PATCH v6 3/11 x86/cet/ibt: Add IBT legacy code bitmap setup function
In reply to Yu-cheng YuIndirect Branch Tracking (IBT) provides an optional legacy code bitmap that allows execution of legacy, non-IBT compatible library by an IBT-enabled application. When set, each bit in the bitmap indicates one page of legacy code.
The bitmap is allocated and setup from the application.
--- arch/x86/include/asm/cet.h | 1 + arch/x86/kernel/cet.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)
arch/x86/include/asm/cet.h +1 -0
@@ -29,6 +29,7 @@ void cet_disable_free_shstk(struct task_struct *p);int cet_restore_signal (unsigned long ssp);int cet_setup_signal (bool ia32,unsigned long rstor,unsigned long *new_ssp);int cet_setup_ibt (void ); +int cet_setup_ibt_bitmap (unsigned long bitmap,unsigned long size);void cet_disable_ibt (void );#else static inline int prctl_cet (int option,unsigned long arg2) {return -EINVAL ; }
arch/x86/kernel/cet.c +23 -0
@@ -21,6 +21,7 @@#include <asm/fpu/types.h> #include <asm/cet.h> #include <asm/special_insns.h> +#include <asm/elf.h> static int set_shstk_ptr (unsigned long addr) {
@@ -333,3 +334,25 @@ void cet_disable_ibt(void)wrmsrl (MSR_IA32_U_CET , r); current->thread.cet.ibt_enabled =0 ; } + +int cet_setup_ibt_bitmap (unsigned long bitmap,unsigned long size) +{ +u64 r; + +if (!current->thread.cet.ibt_enabled) +return -EINVAL ; + +if (!PAGE_ALIGNED (bitmap) || (size >TASK_SIZE_MAX )) +return -EINVAL ; + + current->thread.cet.ibt_bitmap_addr = bitmap; + current->thread.cet.ibt_bitmap_size = size; + +/* +* Turn on IBT legacy bitmap. +*/ +rdmsrl (MSR_IA32_U_CET , r); + r |= (MSR_IA32_CET_LEG_IW_EN | bitmap); +wrmsrl (MSR_IA32_U_CET , r); +return 0 ; +}
Signature · 1 line
2.17.1
RFC PATCH v6 4/11 mm/mmap: Add IBT bitmap size to address space limit check
In reply to Yu-cheng YuThe indirect branch tracking legacy bitmap takes a large address space. This causes may_expand_vm() failure on the address limit check. For a IBT-enabled task, add the bitmap size to the address limit.
--- arch/x86/include/asm/mmu_context.h | 10 ++++++++++ mm/mmap.c | 19 ++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-)
arch/x86/include/asm/mmu_context.h +10 -0
@@ -341,4 +341,14 @@ static inline unsigned long __get_current_cr3_fast(void) return cr3; } +#ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER +static inline unsigned long arch_as_limit (void ) +{ +if (current->thread.cet.ibt_enabled) +return current->thread.cet.ibt_bitmap_size; +else +return 0 ; +} +#endif +#endif /* _ASM_X86_MMU_CONTEXT_H */
mm/mmap.c +18 -1
@@ -3283,13 +3283,30 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,return NULL ; } +#ifndef CONFIG_ARCH_HAS_AS_LIMIT +static inline unsigned long arch_as_limit (void ) +{ +return 0 ; +} +#endif +/* * Return true if the calling process may expand its vm space by the passed * number of pages */ bool may_expand_vm (struct mm_struct *mm,vm_flags_t flags,unsigned long npages) { -if (mm->total_vm + npages >rlimit (RLIMIT_AS ) >>PAGE_SHIFT ) +unsigned long as_limit =rlimit (RLIMIT_AS ); +unsigned long as_limit_plus = as_limit +arch_as_limit (); + +/* as_limit_plus overflowed */ +if (as_limit_plus < as_limit) + as_limit_plus =RLIM_INFINITY ; + +if (as_limit_plus > as_limit) + as_limit = as_limit_plus; + +if (mm->total_vm + npages > as_limit >>PAGE_SHIFT )return false; if (is_data_mapping(flags) &&
Signature · 1 line
2.17.1
RFC PATCH v6 5/11 x86/cet/ibt: ELF header parsing for IBT
In reply to Yu-cheng YuLook in .note.gnu.property of an ELF file and check if Indirect Branch Tracking needs to be enabled for the task.
--- arch/x86/include/uapi/asm/elf_property.h | 1 + arch/x86/kernel/elf.c | 5 +++++ 2 files changed, 6 insertions(+)
arch/x86/include/uapi/asm/elf_property.h +1 -0
@@ -11,5 +11,6 @@* Bits for GNU_PROPERTY_X86_FEATURE_1_AND */ #define GNU_PROPERTY_X86_FEATURE_1_SHSTK (0x00000002) +#define GNU_PROPERTY_X86_FEATURE_1_IBT (0x00000001)#endif /* _UAPI_ASM_X86_ELF_PROPERTY_H */
arch/x86/kernel/elf.c +5 -0
@@ -353,6 +353,11 @@ int arch_setup_features(void *ehdr_p, void *phdr_p, } } +if (cpu_feature_enabled (X86_FEATURE_IBT )) { +if (feature &GNU_PROPERTY_X86_FEATURE_1_IBT ) + err =cet_setup_ibt (); + } + out:return err; }
Signature · 1 line
2.17.1
RFC PATCH v6 6/11 x86/cet/ibt: Add arch_prctl functions for IBT
In reply to Yu-cheng YuUpdate ARCH_X86_CET_STATUS and ARCH_X86_CET_DISABLE to include Indirect Branch Tracking features.
Introduce:
arch_prctl(ARCH_X86_CET_SET_LEGACY_BITMAP, unsigned long *addr)
Enable the Indirect Branch Tracking legacy code bitmap.
The parameter 'addr' is a pointer to a user buffer that has:
*addr = IBT bitmap base address
*(addr + 1) = IBT bitmap size
--- arch/x86/include/uapi/asm/prctl.h | 2 ++ arch/x86/kernel/cet_prctl.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+)
arch/x86/include/uapi/asm/prctl.h +2 -0
@@ -18,5 +18,7 @@#define ARCH_X86_CET_DISABLE 0x3002#define ARCH_X86_CET_LOCK 0x3003#define ARCH_X86_CET_ALLOC_SHSTK 0x3004 +#define ARCH_X86_CET_GET_LEGACY_BITMAP 0x3005/* deprecated */ +#define ARCH_X86_CET_SET_LEGACY_BITMAP 0x3006#endif /* _ASM_X86_PRCTL_H */
arch/x86/kernel/cet_prctl.c +21 -0
@@ -21,6 +21,8 @@ static int handle_get_status(unsigned long arg2)if (current->thread.cet.shstk_enabled) features |=GNU_PROPERTY_X86_FEATURE_1_SHSTK ; +if (current->thread.cet.ibt_enabled) + features |=GNU_PROPERTY_X86_FEATURE_1_IBT ; shstk_base = current->thread.cet.shstk_base; shstk_size = current->thread.cet.shstk_size;
@@ -56,6 +58,17 @@ static int handle_alloc_shstk(unsigned long arg2)return 0 ; } +static int handle_bitmap (unsigned long arg2) +{ +unsigned long addr, size; + +if (get_user (addr, (unsigned long __user *)arg2) || +get_user (size, (unsigned long __user *)arg2 +1 )) +return -EFAULT ; + +return cet_setup_ibt_bitmap (addr, size); +} +int prctl_cet (int option,unsigned long arg2) {if (!cpu_x86_cet_enabled ())
@@ -70,6 +83,8 @@ int prctl_cet(int option, unsigned long arg2)return -EPERM ;if (arg2 &GNU_PROPERTY_X86_FEATURE_1_SHSTK )cet_disable_free_shstk (current); +if (arg2 &GNU_PROPERTY_X86_FEATURE_1_IBT ) +cet_disable_ibt ();return 0 ;
@@ -80,6 +95,12 @@ int prctl_cet(int option, unsigned long arg2)case ARCH_X86_CET_ALLOC_SHSTK :return handle_alloc_shstk (arg2); +/* +* Allocate legacy bitmap and return address & size to user. +*/ +case ARCH_X86_CET_SET_LEGACY_BITMAP : +return handle_bitmap (arg2); +default :return -EINVAL ; }
Signature · 1 line
2.17.1
RFC PATCH v6 7/11 x86/cet/ibt: Add ENDBR to op-code-map
In reply to Yu-cheng YuAdd control transfer terminating instructions:
ENDBR64/ENDBR32:
Mark a valid 64/32-bit control transfer endpoint.
--- arch/x86/lib/x86-opcode-map.txt | 13 +++++++++++-- tools/objtool/arch/x86/lib/x86-opcode-map.txt | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-)
arch/x86/lib/x86-opcode-map.txt +11 -2
@@ -620,7 +620,16 @@ ea: SAVEPREVSSP (f3) # Skip 0xeb-0xff EndTable -Table: 3-byte opcode 2 (0x0f 0x38) +Table: 3-byte opcode 2 (0x0f 0x1e) +Referrer: +AVXcode: +# Skip 0x00-0xf9 +fa: ENDBR64 (f3) +fb: ENDBR32 (f3) +#skip 0xfc-0xff +EndTable + +Table: 3-byte opcode 3 (0x0f 0x38) Referrer: 3-byte escape 1 AVXcode: 2 # 0x0f 0x38 0x00-0x0f
@@ -804,7 +813,7 @@ f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) | WRSS Pq,Qq f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v) EndTable -Table: 3-byte opcode 3 (0x0f 0x3a) +Table: 3-byte opcode 4 (0x0f 0x3a) Referrer: 3-byte escape 2 AVXcode: 3 # 0x0f 0x3a 0x00-0xff
tools/objtool/arch/x86/lib/x86-opcode-map.txt +11 -2
@@ -620,7 +620,16 @@ ea: SAVEPREVSSP (f3) # Skip 0xeb-0xff EndTable -Table: 3-byte opcode 2 (0x0f 0x38) +Table: 3-byte opcode 2 (0x0f 0x1e) +Referrer: +AVXcode: +# Skip 0x00-0xf9 +fa: ENDBR64 (f3) +fb: ENDBR32 (f3) +#skip 0xfc-0xff +EndTable + +Table: 3-byte opcode 3 (0x0f 0x38) Referrer: 3-byte escape 1 AVXcode: 2 # 0x0f 0x38 0x00-0x0f
@@ -804,7 +813,7 @@ f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v) | WRSS Pq,Qq f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v) EndTable -Table: 3-byte opcode 3 (0x0f 0x3a) +Table: 3-byte opcode 4 (0x0f 0x3a) Referrer: 3-byte escape 2 AVXcode: 3 # 0x0f 0x3a 0x00-0xff
Signature · 1 line
2.17.1
RFC PATCH v6 8/11 x86: Insert endbr32/endbr64 to vDSO
In reply to Yu-cheng YuFrom: "H.J. Lu" <[email protected]>
When Intel indirect branch tracking is enabled, functions in vDSO which may be called indirectly must have endbr32 or endbr64 as the first instruction. Compiler must support -fcf-protection=branch so that it can be used to compile vDSO.
--- arch/x86/entry/vdso/.gitignore | 4 ++++ arch/x86/entry/vdso/Makefile | 12 +++++++++++- arch/x86/entry/vdso/vdso-layout.lds.S | 1 + 3 files changed, 16 insertions(+), 1 deletion(-)
arch/x86/entry/vdso/.gitignore +4 -0
@@ -5,3 +5,7 @@ vdso32-sysenter-syms.lds vdso32-int80-syms.lds vdso-image-*.c vdso2c +vclock_gettime.S +vgetcpu.S +vclock_gettime.asm +vgetcpu.asm
arch/x86/entry/vdso/Makefile +11 -1
@@ -108,13 +108,17 @@ vobjx32s := $(foreach F,$(vobjx32s-y),$(obj)/$F) # Convert 64bit object file to x32 for x32 vDSO. quiet_cmd_x32 = X32 $@ - cmd_x32 = $(OBJCOPY) -O elf32-x86-64 $< $@ + cmd_x32 = $(OBJCOPY) -R .note.gnu.property -O elf32-x86-64 $< $@ $(obj)/%-x32.o: $(obj)/%.o FORCE $(call if_changed,x32) targets += vdsox32.lds $(vobjx32s-y) +ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + $(obj)/vclock_gettime.o $(obj)/vgetcpu.o $(obj)/vdso32/vclock_gettime.o: KBUILD_CFLAGS += -fcf-protection=branch +endif + $(obj)/%.so: OBJCOPYFLAGS := -S $(obj)/%.so: $(obj)/%.so.dbg $(call if_changed,objcopy)
@@ -172,6 +176,12 @@ quiet_cmd_vdso = VDSO $@ VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \ $(call ld-option, --build-id) -Bsymbolic +ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + VDSO_LDFLAGS += $(call ldoption, -z$(comma)ibt) +endif +ifdef CONFIG_X86_INTEL_SHADOW_STACK_USER + VDSO_LDFLAGS += $(call ldoption, -z$(comma)shstk) +endif GCOV_PROFILE := n #
arch/x86/entry/vdso/vdso-layout.lds.S +1 -0
@@ -74,6 +74,7 @@ SECTIONS .fake_shstrtab : { *(.fake_shstrtab) } :text + .note.gnu.property : { *(.note.gnu.property) } :text :note .note : { *(.note.*) } :text :note .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr
Signature · 1 line
2.17.1
Re: [RFC PATCH v6 08/11] x86: Insert endbr32/endbr64 to vDSO
Quoted 20 lines · Yu-cheng Yu
From: "H.J. Lu" <[email protected]>
When Intel indirect branch tracking is enabled, functions in vDSO which may be called indirectly must have endbr32 or endbr64 as the first instruction. Compiler must support -fcf-protection=branch so that it can be used to compile vDSO.
Signed-off-by H.J. Lu <[email protected]>--- arch/x86/entry/vdso/.gitignore | 4 ++++ arch/x86/entry/vdso/Makefile | 12 +++++++++++- arch/x86/entry/vdso/vdso-layout.lds.S | 1 + 3 files changed, 16 insertions(+), 1 deletion(-)arch/x86/entry/vdso/.gitignore +0
-0
arch/x86/entry/vdso/.gitignore vdso32-sysenter-syms.lds · line 11
Quoted 7 lines
arch/x86/entry/vdso/.gitignore +4
-0@@ -5,3 +5,7 @@ vdso32-sysenter-syms.lds vdso32-int80-syms.lds vdso-image-*.c vdso2c +vclock_gettime.S +vgetcpu.S +vclock_gettime.asm +vgetcpu.asm
What's this hunk about?
Re: [RFC PATCH v6 08/11] x86: Insert endbr32/endbr64 to vDSO
Quoted 16 lines · Andy Lutomirski
Quoted 15 lines · Yu-cheng Yu
From: "H.J. Lu" <[email protected]>
When Intel indirect branch tracking is enabled, functions in vDSO which may be called indirectly must have endbr32 or endbr64 as the first instruction. Compiler must support -fcf-protection=branch so that it can be used to compile vDSO.
Signed-off-by H.J. Lu <[email protected]>--- arch/x86/entry/vdso/.gitignore | 4 ++++ arch/x86/entry/vdso/Makefile | 12 +++++++++++- arch/x86/entry/vdso/vdso-layout.lds.S | 1 + 3 files changed, 16 insertions(+), 1 deletion(-)
Quoted 15 lines
arch/x86/entry/vdso/.gitignore vdso32-sysenter-syms.lds · line 11
Quoted 12 lines
arch/x86/entry/vdso/.gitignore +4
-0@@ -5,3 +5,7 @@ vdso32-sysenter-syms.lds vdso32-int80-syms.lds vdso-image-*.c vdso2c +vclock_gettime.S +vgetcpu.S +vclock_gettime.asm +vgetcpu.asmWhat's this hunk about?
We used to allow using non-CET capable BINUTILS and the Makefile would create these. I will remove them from the patch.
Yu-cheng
RFC PATCH v6 9/11 x86/vsyscall/32: Add ENDBR32 to vsyscall entry point
In reply to Yu-cheng YuFrom: "H.J. Lu" <[email protected]>
Add ENDBR32 to vsyscall entry point.
--- arch/x86/entry/vdso/vdso32/system_call.S | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/entry/vdso/vdso32/system_call.S +3 -0
@@ -14,6 +14,9 @@ ALIGN __kernel_vsyscall: CFI_STARTPROC +#ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + endbr32 +#endif /* * Reshuffle regs so that all of any of the entry instructions * will preserve enough state.
Signature · 1 line
2.17.1
Re: [RFC PATCH v6 09/11] x86/vsyscall/32: Add ENDBR32 to vsyscall entry point
Quoted 4 lines · Yu-cheng Yu
From: "H.J. Lu" <[email protected]>
Add ENDBR32 to vsyscall entry point.
$SUBJECT should be "x86/vdso/32: Add ENDBR32 to __kernel_vsyscall entry point".
--Andy
Re: [RFC PATCH v6 09/11] x86/vsyscall/32: Add ENDBR32 to vsyscall entry point
Quoted 8 lines · Andy Lutomirski
Quoted 4 lines · Yu-cheng Yu
From: "H.J. Lu" <[email protected]>
Add ENDBR32 to vsyscall entry point.
$SUBJECT should be "x86/vdso/32: Add ENDBR32 to
__kernel_vsyscallentry point".
I will fix it.
Yu-cheng
RFC PATCH v6 10/11 x86/vsyscall/64: Add ENDBR64 to vsyscall entry points
In reply to Yu-cheng YuFrom: "H.J. Lu" <[email protected]>
Add ENDBR64 to vsyscall entry points.
--- arch/x86/entry/vsyscall/vsyscall_emu_64.S | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/x86/entry/vsyscall/vsyscall_emu_64.S +9 -0
@@ -18,16 +18,25 @@ __PAGE_ALIGNED_DATA .type __vsyscall_page, @object __vsyscall_page: +#ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + endbr64 +#endif mov $__NR_gettimeofday, %rax syscall ret .balign 1024, 0xcc +#ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + endbr64 +#endif mov $__NR_time, %rax syscall ret .balign 1024, 0xcc +#ifdef CONFIG_X86_INTEL_BRANCH_TRACKING_USER + endbr64 +#endif mov $__NR_getcpu, %rax syscall ret
Signature · 1 line
2.17.1
Re: [RFC PATCH v6 10/11] x86/vsyscall/64: Add ENDBR64 to vsyscall entry points
Quoted 6 lines · Yu-cheng Yu
From: "H.J. Lu" <[email protected]>
Add ENDBR64 to vsyscall entry points.
Signed-off-by H.J. Lu <[email protected]>
although the scenarios where this matters will be extremely rare, given that this code is mapped NX :) Tools like 'pin' may care.
--Andy
RFC PATCH v6 11/11 x86/cet: Add PTRACE interface for CET
In reply to Yu-cheng YuAdd REGSET_CET64/REGSET_CET32 to get/set CET MSRs:
IA32_U_CET (user-mode CET settings) and
IA32_PL3_SSP (user-mode shadow stack)
--- arch/x86/include/asm/fpu/regset.h | 7 +++--- arch/x86/kernel/fpu/regset.c | 41 +++++++++++++++++++++++++++++++ arch/x86/kernel/ptrace.c | 16 ++++++++++++ include/uapi/linux/elf.h | 1 + 4 files changed, 62 insertions(+), 3 deletions(-)
arch/x86/include/asm/fpu/regset.h +4 -3
@@ -7,11 +7,12 @@#include <linux/regset.h> -extern user_regset_active_fn regset_fpregs_active, regset_xregset_fpregs_active; +extern user_regset_active_fn regset_fpregs_active, regset_xregset_fpregs_active, + cetregs_active;extern user_regset_get_fn fpregs_get, xfpregs_get, fpregs_soft_get, - xstateregs_get; + xstateregs_get, cetregs_get;extern user_regset_set_fn fpregs_set, xfpregs_set, fpregs_soft_set, - xstateregs_set; + xstateregs_set, cetregs_set;/* * xstateregs_active == regset_fpregs_active. Please refer to the comment
arch/x86/kernel/fpu/regset.c +41 -0
47 lines not on this page · raw message
arch/x86/kernel/ptrace.c +16 -0
@@ -50,7 +50,9 @@ enum x86_regset {REGSET_IOPERM64 =REGSET_XFP ,REGSET_XSTATE ,REGSET_TLS , +REGSET_CET64 =REGSET_TLS ,REGSET_IOPERM32 , + REGSET_CET32, }; struct pt_regs_offset {
@@ -1266,6 +1268,13 @@ static struct user_regset x86_64_regsets[] __ro_after_init = { .size = sizeof(long), .align = sizeof(long), .active = ioperm_active, .get = ioperm_get }, + [REGSET_CET64] = { + .core_note_type = NT_X86_CET, + .n = sizeof(struct cet_user_state) / sizeof(u64), + .size = sizeof(u64), .align = sizeof(u64), + .active = cetregs_active, .get = cetregs_get, + .set = cetregs_set + }, };static const struct user_regset_view user_x86_64_view = {
@@ -1321,6 +1330,13 @@ static struct user_regset x86_32_regsets[] __ro_after_init = { .size = sizeof(u32), .align = sizeof(u32), .active = ioperm_active, .get = ioperm_get }, + [REGSET_CET32] = { + .core_note_type = NT_X86_CET, + .n = sizeof(struct cet_user_state) / sizeof(u64), + .size = sizeof(u64), .align = sizeof(u64), + .active = cetregs_active, .get = cetregs_get, + .set = cetregs_set + }, };static const struct user_regset_view user_x86_32_view = {
include/uapi/linux/elf.h +1 -0
@@ -401,6 +401,7 @@ typedef struct elf64_shdr {#define NT_386_TLS 0x200/* i386 TLS slots (struct user_desc) */ #define NT_386_IOPERM 0x201/* x86 io permission bitmap (1=deny) */ #define NT_X86_XSTATE 0x202/* x86 extended state using xsave */ +#define NT_X86_CET 0x203/* x86 cet state */ #define NT_S390_HIGH_GPRS 0x300/* s390 upper register halves */ #define NT_S390_TIMER 0x301/* s390 timer register */ #define NT_S390_TODCMP 0x302/* s390 TOD clock comparator register */
Signature · 1 line
2.17.1