linux-user/signal.c: Ensure AArch64 signal frame isn't too small
The AArch64 signal frame design was extended for SVE in commit8c5931de0a
, so that instead of having a fixed setup we now add various records to the frame, with some of them possibly overflowing into an extra space outside the original 4K reserved block in the target_sigcontext. However, we failed to ensure that we always at least allocate the 4K reserved block. This is ABI, and some userspace programs rely on it. In particular the dash shell would segfault if the frame wasn't as big enough. (Compare the kernel's sigframe_size() function in arch/arm64/kernel/signal.c.) Reported-by: Richard Henwood <richard.henwood@arm.com> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20180409140714.26841-1-peter.maydell@linaro.org Fixes: https://bugs.launchpad.net/bugs/1761535 Fixes:8c5931de0a
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
c52e7132d7
commit
7f0f4208b3
|
@ -1850,6 +1850,12 @@ static void target_setup_frame(int usig, struct target_sigaction *ka,
|
||||||
fr_ofs = layout.total_size;
|
fr_ofs = layout.total_size;
|
||||||
layout.total_size += sizeof(struct target_rt_frame_record);
|
layout.total_size += sizeof(struct target_rt_frame_record);
|
||||||
|
|
||||||
|
/* We must always provide at least the standard 4K reserved space,
|
||||||
|
* even if we don't use all of it (this is part of the ABI)
|
||||||
|
*/
|
||||||
|
layout.total_size = MAX(layout.total_size,
|
||||||
|
sizeof(struct target_rt_sigframe));
|
||||||
|
|
||||||
frame_addr = get_sigframe(ka, env, layout.total_size);
|
frame_addr = get_sigframe(ka, env, layout.total_size);
|
||||||
trace_user_setup_frame(env, frame_addr);
|
trace_user_setup_frame(env, frame_addr);
|
||||||
if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
|
if (!lock_user_struct(VERIFY_WRITE, frame, frame_addr, 0)) {
|
||||||
|
|
Loading…
Reference in a new issue