diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-12 03:53:34 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-12 03:53:34 -0400 |
| commit | 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e (patch) | |
| tree | d18f58349ced242aa62e622e381e60933f71d451 /arch/powerpc/kernel/signal_64.c | |
| parent | 6218a761bbc27acc65248c80024875bcc06d52b1 (diff) | |
| parent | 289a1e995e74734b5ec76ca8a5490058f4fecc24 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/kernel/signal_64.c')
| -rw-r--r-- | arch/powerpc/kernel/signal_64.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index 66a5fbe31989..6e75d7ab6d4d 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
| @@ -184,6 +184,8 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig, | |||
| 184 | err |= __get_user(v_regs, &sc->v_regs); | 184 | err |= __get_user(v_regs, &sc->v_regs); |
| 185 | if (err) | 185 | if (err) |
| 186 | return err; | 186 | return err; |
| 187 | if (v_regs && !access_ok(VERIFY_READ, v_regs, 34 * sizeof(vector128))) | ||
| 188 | return -EFAULT; | ||
| 187 | /* Copy 33 vec registers (vr0..31 and vscr) from the stack */ | 189 | /* Copy 33 vec registers (vr0..31 and vscr) from the stack */ |
| 188 | if (v_regs != 0 && (msr & MSR_VEC) != 0) | 190 | if (v_regs != 0 && (msr & MSR_VEC) != 0) |
| 189 | err |= __copy_from_user(current->thread.vr, v_regs, | 191 | err |= __copy_from_user(current->thread.vr, v_regs, |