Skip to contentSkip to conversation

um: properly align signal stack on x86_64

PATCH New Benjamin Berg 1 participant 1 message Jan 7, 2025

Subsystems (2)
x86 User-mode Linux (UML)
lore
Share & tools
lore

Benjamin Berg

author
#0 lore raw

PATCH 1/1 um: properly align signal stack on x86_64

From: Benjamin Berg <[email protected]>

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 3f17fed21491 ("um: switch to regset API and depend on XSTATE")
Signed-off-by Benjamin Berg <[email protected]>
---
 arch/x86/um/signal.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
arch/x86/um/signal.c +5 -3
index 75087e85b6fd..9ab9b29a5b25 100644
@@ -367,11 +367,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);
Signature · 1 line
2.47.1