diff options
-rw-r--r-- | arch/mips/kernel/signal32.c | 4 | ||||
-rw-r--r-- | include/asm-mips/compat-signal.h | 3 |
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 | ||
156 | struct rt_sigframe32 { | 156 | struct 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]); |