Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / arch / ppc / kernel / align.c

diff --git a/arch/ppc/kernel/align.c b/arch/ppc/kernel/align.c
index 40d356c66c41c0eda6846083da858efbc6bba4cc..ff81da9598d89e61455b3b6d802390c6ed83c89c 100644 (file)
--- a/arch/ppc/kernel/align.c
+++ b/arch/ppc/kernel/align.c
@@ -290,6 +290,10 @@ fix_alignment(struct pt_regs *regs)
                        /* lwm, stmw */
                        nb = (32 - reg) * 4;
                }
+
+               if (!access_ok((flags & ST? VERIFY_WRITE: VERIFY_READ), addr, nb+nb0))
+                       return -EFAULT; /* bad address */
+
                rptr = (unsigned char *) &regs->gpr[reg];
                if (flags & LD) {
                        for (i = 0; i < nb; ++i)