Re: [Qemu-ppc] [PATCH 1/1] target-ppc, tcg: fix usermode segfault with pthread_create()

[David Gibson]

On Mon, Jan 30, 2017 at 04:08:07PM +1100, Sam Bobroff wrote:
> Programs run under qemu-ppc64 on an x86_64 host currently segfault
> if they use pthread_create() due to the adjustment made to the NIP in
> commit bd6fefe71cec5a0c7d2be4ac96307f25db56abf9.
> 
> This patch changes cpu_loop() to set the NIP back to the
> pre-incremented value before calling do_syscall(), which causes the
> correct address to be used for the new thread and corrects the fault.
> 
> Signed-off-by: Sam Bobroff <address@hidden>

Applied to ppc-for-2.9, thanks.

> ---
> 
>  linux-user/main.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 30049581ef..b5dee01541 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -1712,18 +1712,20 @@ void cpu_loop(CPUPPCState *env)
>               * in syscalls.
>               */
>              env->crf[0] &= ~0x1;
> +            env->nip += 4;
>              ret = do_syscall(env, env->gpr[0], env->gpr[3], env->gpr[4],
>                               env->gpr[5], env->gpr[6], env->gpr[7],
>                               env->gpr[8], 0, 0);
>              if (ret == -TARGET_ERESTARTSYS) {
> +                env->nip -= 4;
>                  break;
>              }
>              if (ret == (target_ulong)(-TARGET_QEMU_ESIGRETURN)) {
> +                env->nip -= 4;
>                  /* Returning from a successful sigreturn syscall.
>                     Avoid corrupting register state.  */
>                  break;
>              }
> -            env->nip += 4;
>              if (ret > (target_ulong)(-515)) {
>                  env->crf[0] |= 0x1;
>                  ret = -ret;

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature