From: Paul Mackerras <paulus@samba.org>
Date: Mon, 12 Jun 2006 07:53:34 +0000 (+1000)
Subject: Merge branch 'merge'
X-Git-Tag: v2.6.18-rc1~1081^2~225^2~62
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a0c58d0513c246ac5438ef4a55ce8b93395ae0e;p=linux-2.6

Merge branch 'merge'
---

7a0c58d0513c246ac5438ef4a55ce8b93395ae0e
diff --cc arch/powerpc/kernel/signal_64.c
index 66a5fbe319,c2db642f4c..6e75d7ab6d
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@@ -182,8 -179,11 +182,10 @@@ static long restore_sigcontext(struct p
  
  #ifdef CONFIG_ALTIVEC
  	err |= __get_user(v_regs, &sc->v_regs);
 -	err |= __get_user(msr, &sc->gp_regs[PT_MSR]);
  	if (err)
  		return err;
+ 	if (v_regs && !access_ok(VERIFY_READ, v_regs, 34 * sizeof(vector128)))
+ 		return -EFAULT;
  	/* Copy 33 vec registers (vr0..31 and vscr) from the stack */
  	if (v_regs != 0 && (msr & MSR_VEC) != 0)
  		err |= __copy_from_user(current->thread.vr, v_regs,