From cd26554a74060d30ea998ad55a2d005e11dfb286 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sun, 26 Sep 2010 19:28:22 +0100
Subject: [PATCH] --- yaml --- r: 211007 b: refs/heads/master c:
 18e6bfa96d4d810ad9a69e17f08e0d0089379f22 h: refs/heads/master i:   211005:
 72ed9e8601e6f81b7f473b44f3fcc36863ab5dae   211003:
 3a6741adf086fec11317e0b281a9ad74bf39249c   210999:
 bac32677a02fcb1e88c9748502c202bd3f6fd95f   210991:
 0e783a3c37c024e9af1609fc528e6fb533d7bdbc   210975:
 b1368f62090c25994437f29e69b23fed619336fb   210943:
 a9c5b849dc3a01cb102c8f659d5617d2ac5b8508 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/alpha/kernel/signal.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b133ddf81542..66dd02b84d98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c52c2ddc1dfa6fe85ffd5e4c57cf91f6982639fe
+refs/heads/master: 18e6bfa96d4d810ad9a69e17f08e0d0089379f22
diff --git a/trunk/arch/alpha/kernel/signal.c b/trunk/arch/alpha/kernel/signal.c
index 06609aa363b6..779780a332d3 100644
--- a/trunk/arch/alpha/kernel/signal.c
+++ b/trunk/arch/alpha/kernel/signal.c
@@ -68,9 +68,9 @@ SYSCALL_DEFINE3(osf_sigaction, int, sig,
 		old_sigset_t mask;
 		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
 		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-		    __get_user(new_ka.sa.sa_flags, &act->sa_flags))
+		    __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||
+		    __get_user(mask, &act->sa_mask))
 			return -EFAULT;
-		__get_user(mask, &act->sa_mask);
 		siginitset(&new_ka.sa.sa_mask, mask);
 		new_ka.ka_restorer = NULL;
 	}
@@ -80,9 +80,9 @@ SYSCALL_DEFINE3(osf_sigaction, int, sig,
 	if (!ret && oact) {
 		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
 		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-		    __put_user(old_ka.sa.sa_flags, &oact->sa_flags))
+		    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||
+		    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))
 			return -EFAULT;
-		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
 	}
 
 	return ret;