From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 29 Jul 2022 20:19:42 +0000 (-0700)
Subject: linux-user/riscv: Align signal frame to 16 bytes
X-Git-Tag: v7.1.0-rc1~4^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1eaa63429a9944265c92efdb94c02fabb231f564;p=users%2Fdwmw2%2Fqemu.git

linux-user/riscv: Align signal frame to 16 bytes

Follow the kernel's alignment, as we already noted.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1093
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20220729201942.30738-1-richard.henderson@linaro.org>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---

diff --git a/linux-user/riscv/signal.c b/linux-user/riscv/signal.c
index 296e39fbf0..eaa168199a 100644
--- a/linux-user/riscv/signal.c
+++ b/linux-user/riscv/signal.c
@@ -64,9 +64,7 @@ static abi_ulong get_sigframe(struct target_sigaction *ka,
 
     /* This is the X/Open sanctioned signal stack switching.  */
     sp = target_sigsp(sp, ka) - framesize;
-
-    /* XXX: kernel aligns with 0xf ? */
-    sp &= ~3UL; /* align sp on 4-byte boundary */
+    sp &= ~0xf;
 
     return sp;
 }