| Message ID | 1357156566-38368-1-git-send-email-LightningTH@GMail.com |
|---|---|
| State | New |
| Headers | show |
On 2 January 2013 19:56, Samuel Seay <lightningth@gmail.com> wrote: > Removed h2g() macro around the ka->_sa_handler due to _sa_handler being a guest value > Changed the __put_user macro as it was attempting to put a value to a guest memory location without converting to the guest area > > Signed-off-by: Samuel Seay <LightningTH@GMail.com> > --- > linux-user/signal.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/linux-user/signal.c b/linux-user/signal.c > index 95e2ffa..d0d24fc 100644 > --- a/linux-user/signal.c > +++ b/linux-user/signal.c > @@ -4584,7 +4584,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, > > signal = current_exec_domain_sig(sig); > > - err |= __put_user(h2g(ka->_sa_handler), &sc->handler); > + err |= __put_user(ka->_sa_handler, &sc->handler); > err |= __put_user(set->sig[0], &sc->oldmask); > #if defined(TARGET_PPC64) > err |= __put_user(set->sig[0] >> 32, &sc->_unused[3]); > @@ -4606,7 +4606,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, > > /* Create a stack frame for the caller of the handler. */ > newsp = frame_addr - SIGNAL_FRAMESIZE; > - err |= __put_user(env->gpr[1], (target_ulong *)(uintptr_t) newsp); > + err |= put_user(env->gpr[1], (target_ulong)(uintptr_t) newsp, target_ulong); newsp is already a target_ulong, you don't need either of these casts. -- PMM
diff --git a/linux-user/signal.c b/linux-user/signal.c index 95e2ffa..d0d24fc 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -4584,7 +4584,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, signal = current_exec_domain_sig(sig); - err |= __put_user(h2g(ka->_sa_handler), &sc->handler); + err |= __put_user(ka->_sa_handler, &sc->handler); err |= __put_user(set->sig[0], &sc->oldmask); #if defined(TARGET_PPC64) err |= __put_user(set->sig[0] >> 32, &sc->_unused[3]); @@ -4606,7 +4606,7 @@ static void setup_frame(int sig, struct target_sigaction *ka, /* Create a stack frame for the caller of the handler. */ newsp = frame_addr - SIGNAL_FRAMESIZE; - err |= __put_user(env->gpr[1], (target_ulong *)(uintptr_t) newsp); + err |= put_user(env->gpr[1], (target_ulong)(uintptr_t) newsp, target_ulong); if (err) goto sigsegv;
Removed h2g() macro around the ka->_sa_handler due to _sa_handler being a guest value Changed the __put_user macro as it was attempting to put a value to a guest memory location without converting to the guest area Signed-off-by: Samuel Seay <LightningTH@GMail.com> --- linux-user/signal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)