From: Andreas Schwab <schwab@suse.de>
Date: Wed, 11 Mar 2015 14:08:42 +0000 (+0100)
Subject: m68k: fix sigreturn decoding
X-Git-Tag: v4.11~578
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=712f0e12bd3cc2059229cbe301192768ab7fea07;p=strace

m68k: fix sigreturn decoding

* sigreturn.c (sys_sigreturn) [M68K]: Fetch the words of the
signal mask from the proper place.
---

diff --git a/sigreturn.c b/sigreturn.c
index c253a0c5..365ef1ab 100644
--- a/sigreturn.c
+++ b/sigreturn.c
@@ -128,8 +128,20 @@ sys_sigreturn(struct tcb *tcp)
 		long addr;
 		if (upeek(tcp->pid, 4*PT_USP, &addr) < 0)
 			return 0;
+		/* Fetch pointer to struct sigcontext.  */
+		if (umove(tcp, addr + 2 * sizeof(int), &addr) < 0)
+			return 0;
+		unsigned long mask[NSIG / 8 / sizeof(long)];
+		/* Fetch first word of signal mask.  */
+		if (umove(tcp, addr, &mask[0]) < 0)
+			return 0;
+		/* Fetch remaining words of signal mask, located
+		   immediately before.  */
+		addr -= sizeof(mask) - sizeof(long);
+		if (umoven(tcp, addr, sizeof(mask) - sizeof(long), (char *) &mask[1]) < 0)
+			return 0;
 		tprints("{mask=");
-		print_sigset_addr_len(tcp, addr, NSIG / 8);
+		tprintsigmask_addr("", mask);
 		tprints("}");
 	}
 #elif defined(ALPHA)