aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2007-02-14 00:41:01 -0500
committerRalf Baechle <ralf@linux-mips.org>2007-02-18 16:31:33 -0500
commit755f21bb894d3fe57017f5aa8f7ace8808fcb1e3 (patch)
treecac47514d12483302e2a4180d15c639e241b120c
parent8a03d9a498eaf02c8a118752050a5154852c13bf (diff)
[MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code.
access_ok in compat-signal.h is wrong (checking destination instead of source) and redundant (already checked before calling this function). Also sf_mask in struct sigframe32 should be compat_sigset_t type. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/kernel/signal32.c4
-rw-r--r--include/asm-mips/compat-signal.h3
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index c28cb21514c8..9f829f63024b 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -150,7 +150,7 @@ struct sigframe32 {
150 u32 sf_ass[4]; /* argument save space for o32 */ 150 u32 sf_ass[4]; /* argument save space for o32 */
151 u32 sf_code[2]; /* signal trampoline */ 151 u32 sf_code[2]; /* signal trampoline */
152 struct sigcontext32 sf_sc; 152 struct sigcontext32 sf_sc;
153 sigset_t sf_mask; 153 compat_sigset_t sf_mask;
154}; 154};
155 155
156struct rt_sigframe32 { 156struct rt_sigframe32 {
@@ -166,7 +166,7 @@ struct sigframe32 {
166 u32 sf_ass[4]; /* argument save space for o32 */ 166 u32 sf_ass[4]; /* argument save space for o32 */
167 u32 sf_pad[2]; 167 u32 sf_pad[2];
168 struct sigcontext32 sf_sc; /* hw context */ 168 struct sigcontext32 sf_sc; /* hw context */
169 sigset_t sf_mask; 169 compat_sigset_t sf_mask;
170 u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */ 170 u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */
171}; 171};
172 172
diff --git a/include/asm-mips/compat-signal.h b/include/asm-mips/compat-signal.h
index 672077084aa1..d6e7c3b4119a 100644
--- a/include/asm-mips/compat-signal.h
+++ b/include/asm-mips/compat-signal.h
@@ -33,9 +33,6 @@ static inline int __copy_conv_sigset_from_user(sigset_t *d,
33 BUG_ON(sizeof(*d) != sizeof(*s)); 33 BUG_ON(sizeof(*d) != sizeof(*s));
34 BUG_ON(_NSIG_WORDS != 2); 34 BUG_ON(_NSIG_WORDS != 2);
35 35
36 if (unlikely(!access_ok(VERIFY_READ, d, sizeof(*d))))
37 return -EFAULT;
38
39#ifdef CONFIG_CPU_BIG_ENDIAN 36#ifdef CONFIG_CPU_BIG_ENDIAN
40 err = __get_user(u->c.sig[1], &s->sig[0]); 37 err = __get_user(u->c.sig[1], &s->sig[0]);
41 err |= __get_user(u->c.sig[0], &s->sig[1]); 38 err |= __get_user(u->c.sig[0], &s->sig[1]);