Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / arch / s390 / kernel / ptrace.c

diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index afe82bc..b76230b 100644 (file)
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -292,7 +292,9 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data)
                 * psw and gprs are stored on the stack
                 */
                if (addr == (addr_t) &dummy->regs.psw.mask &&
-                   ((data & ~PSW_MASK_USER) != psw_user_bits ||
+                   (((data^psw_user_bits) & ~PSW_MASK_USER) ||
+                    (((data^psw_user_bits) & PSW_MASK_ASC) &&
+                     ((data|psw_user_bits) & PSW_MASK_ASC) == PSW_MASK_ASC) ||
                     ((data & PSW_MASK_EA) && !(data & PSW_MASK_BA))))
                        /* Invalid psw mask. */
                        return -EINVAL;
@@ -595,7 +597,10 @@ static int __poke_user_compat(struct task_struct *child,
                 */
                if (addr == (addr_t) &dummy32->regs.psw.mask) {
                        /* Build a 64 bit psw mask from 31 bit mask. */
-                       if ((tmp & ~PSW32_MASK_USER) != psw32_user_bits)
+                       if (((tmp^psw32_user_bits) & ~PSW32_MASK_USER) ||
+                           (((tmp^psw32_user_bits) & PSW32_MASK_ASC) &&
+                            ((tmp|psw32_user_bits) & PSW32_MASK_ASC)
+                            == PSW32_MASK_ASC))
                                /* Invalid psw mask. */
                                return -EINVAL;
                        regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER) |