Skip to content

Commit f31acae

Browse files
committed
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
2 parents a87d120 + a9d9c33 commit f31acae

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/x86/kernel/fpu/regset.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ int ssp_get(struct task_struct *target, const struct user_regset *regset,
190190
struct fpu *fpu = &target->thread.fpu;
191191
struct cet_user_state *cetregs;
192192

193-
if (!cpu_feature_enabled(X86_FEATURE_USER_SHSTK))
193+
if (!cpu_feature_enabled(X86_FEATURE_USER_SHSTK) ||
194+
!ssp_active(target, regset))
194195
return -ENODEV;
195196

196197
sync_fpstate(fpu);

arch/x86/kernel/static_call.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ EXPORT_SYMBOL_GPL(arch_static_call_transform);
175175
noinstr void __static_call_update_early(void *tramp, void *func)
176176
{
177177
BUG_ON(system_state != SYSTEM_BOOTING);
178-
BUG_ON(!early_boot_irqs_disabled);
179178
BUG_ON(static_call_initialized);
180179
__text_gen_insn(tramp, JMP32_INSN_OPCODE, tramp, func, JMP32_INSN_SIZE);
181180
sync_core();

0 commit comments

Comments
 (0)