mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PPC: fix segfault in signal handling code

Browse Source 
Removed h2g() macro around the ka->_sa_handler due to the _sa_handler being a
guest memory address.

Changed the __put_user to put_user as it was attempting to put a value at the
stack address but the new address is a guest memory address, __put_user is
for host memory addresses.

Signed-off-by: Samuel Seay <LightningTH@GMail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
[agraf: change subject line, reformat commit message]
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Samuel Seay 2013-01-02 10:53:46 +00:00 committed by Alexander Graf
parent 88a78d9093
commit beb526b121
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-user/signal.c
View File

@ -4584,7 +4584,7 @@ static void setup_frame(int sig, struct target_sigaction *ka,
signal = current_exec_domain_sig(sig); 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); err |= __put_user(set->sig[0], &sc->oldmask);
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
err |= __put_user(set->sig[0] >> 32, &sc->_unused[3]); 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. */ /* Create a stack frame for the caller of the handler. */
newsp = frame_addr - SIGNAL_FRAMESIZE; newsp = frame_addr - SIGNAL_FRAMESIZE;
err |= __put_user(env->gpr[1], (target_ulong *)(uintptr_t) newsp); err |= put_user(env->gpr[1], newsp, target_ulong);
if (err) if (err)
goto sigsegv; goto sigsegv;