Commit f31acaef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v6.13_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:

 - Check whether shadow stack is active before using the ptrace regset
   getter

 - Remove a wrong BUG_ON in the early static call code which breaks Xen
   PVH when booting as dom0

* tag 'x86_urgent_for_v6.13_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/fpu: Ensure shadow stack is active before "getting" registers
  x86/static-call: Remove early_boot_irqs_disabled check to fix Xen PVH dom0
parents a87d1203 a9d9c331

arch/x86/kernel/fpu/regset.c

+2 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ int ssp_get(struct task_struct *target, const struct user_regset *regset, 
	struct fpu *fpu = &target->thread.fpu;

	struct cet_user_state *cetregs;



	if (!cpu_feature_enabled(X86_FEATURE_USER_SHSTK))

	if (!cpu_feature_enabled(X86_FEATURE_USER_SHSTK) ||

	    !ssp_active(target, regset))

		return -ENODEV;



	sync_fpstate(fpu);

arch/x86/kernel/static_call.c

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ EXPORT_SYMBOL_GPL(arch_static_call_transform); 
noinstr void __static_call_update_early(void *tramp, void *func)

{

	BUG_ON(system_state != SYSTEM_BOOTING);

	BUG_ON(!early_boot_irqs_disabled);

	BUG_ON(static_call_initialized);

	__text_gen_insn(tramp, JMP32_INSN_OPCODE, tramp, func, JMP32_INSN_SIZE);

	sync_core();