Commit 3c2fc743 authored by Benjamin Berg's avatar Benjamin Berg Committed by Richard Weinberger
Browse files

um: properly align signal stack on x86_64



The stack needs to be properly aligned so 16 byte memory accesses on the
stack are correct. This was broken when introducing the dynamic math
register sizing as the rounding was not moved appropriately.

Fixes: 3f17fed2 ("um: switch to regset API and depend on XSTATE")
Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Link: https://patch.msgid.link/20250107133509.265576-1-benjamin@sipsolutions.net


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 8891b176
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -372,11 +372,13 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,
	int err = 0, sig = ksig->sig;
	unsigned long fp_to;

	frame = (struct rt_sigframe __user *)
		round_down(stack_top - sizeof(struct rt_sigframe), 16);
	frame = (void __user *)stack_top - sizeof(struct rt_sigframe);

	/* Add required space for math frame */
	frame = (struct rt_sigframe __user *)((unsigned long)frame - math_size);
	frame = (void __user *)((unsigned long)frame - math_size);

	/* ABI requires 16 byte boundary alignment */
	frame = (void __user *)round_down((unsigned long)frame, 16);

	/* Subtract 128 for a red zone and 8 for proper alignment */
	frame = (struct rt_sigframe __user *) ((unsigned long) frame - 128 - 8);