diff options
| author | Richard Henderson | 2021-04-26 04:53:11 +0200 |
|---|---|---|
| committer | Laurent Vivier | 2021-05-15 21:43:23 +0200 |
| commit | 56384cf3adaeb15bab479be328605e301ae253f2 (patch) | |
| tree | 21e7e2d6cd96a0b2da2879ea30488b6e39845356 /linux-user/arm | |
| parent | linux-user: Split out target_restore_altstack (diff) | |
| download | qemu-56384cf3adaeb15bab479be328605e301ae253f2.tar.gz qemu-56384cf3adaeb15bab479be328605e301ae253f2.tar.xz qemu-56384cf3adaeb15bab479be328605e301ae253f2.zip | |
linux-user: Use target_restore_altstack in all sigreturn
Note that target_restore_altstack uses the host memory
pointer that we have already verified, so TARGET_EFAULT
is not a possible return value.
Note that using -EFAULT was a bug.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210426025334.1168495-3-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user/arm')
| -rw-r--r-- | linux-user/arm/signal.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/linux-user/arm/signal.c b/linux-user/arm/signal.c index f21d1535e4..b7a772302f 100644 --- a/linux-user/arm/signal.c +++ b/linux-user/arm/signal.c @@ -685,11 +685,7 @@ static int do_sigframe_return_v2(CPUARMState *env, } } - if (do_sigaltstack(context_addr - + offsetof(struct target_ucontext_v2, tuc_stack), - 0, get_sp_from_cpustate(env)) == -EFAULT) { - return 1; - } + target_restore_altstack(&uc->tuc_stack, get_sp_from_cpustate(env)); #if 0 /* Send SIGTRAP if we're single-stepping */ @@ -773,8 +769,7 @@ static long do_rt_sigreturn_v1(CPUARMState *env) goto badframe; } - if (do_sigaltstack(frame_addr + offsetof(struct rt_sigframe_v1, uc.tuc_stack), 0, get_sp_from_cpustate(env)) == -EFAULT) - goto badframe; + target_restore_altstack(&frame->uc.tuc_stack, get_sp_from_cpustate(env)); #if 0 /* Send SIGTRAP if we're single-stepping */ |