aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-05-25 07:51:50 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-05-25 07:51:50 -0700
commitfd36697f71f2272c6e1e1283b81d9d85b9085915 (patch)
treedd4f071268dc7c7017451182dcf5ffe06b0e89a6
parentf76f96e20f766e6bb91593885b1e800f8bc14a52 (diff)
parentfc71ec5f3e93f166f3d5a714c51010810699b098 (diff)
downloadandroid_external_strace-fd36697f71f2272c6e1e1283b81d9d85b9085915.tar.gz
android_external_strace-fd36697f71f2272c6e1e1283b81d9d85b9085915.tar.bz2
android_external_strace-fd36697f71f2272c6e1e1283b81d9d85b9085915.zip
Merge "Fix sigreturn decoding on MIPS"
-rw-r--r--signal.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/signal.c b/signal.c
index ce5b462c..5e73f8fe 100644
--- a/signal.c
+++ b/signal.c
@@ -1500,6 +1500,7 @@ sys_sigreturn(struct tcb *tcp)
tcp->u_arg[0] = 0;
sp = regs.regs[29];
if (umove(tcp, sp, &si) < 0)
+ return 0;
tcp->u_arg[0] = 1;
tcp->u_arg[1] = si.si_mask;
} else {