3 files changed, 17 insertions, 24 deletions

diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index e71cc35de163..9b37b6ab27fe 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -123,8 +123,8 @@ struct user_vfp_exc;
 
 extern int vfp_preserve_user_clear_hwstate(struct user_vfp __user *,
                                            struct user_vfp_exc __user *);
-extern int vfp_restore_user_hwstate(struct user_vfp __user *,
-                                    struct user_vfp_exc __user *);
+extern int vfp_restore_user_hwstate(struct user_vfp *,
+                                    struct user_vfp_exc *);
 #endif
 
 /*
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 0ae74207e43e..db62c51250ad 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -150,22 +150,18 @@ static int preserve_vfp_context(struct vfp_sigframe __user *frame)
 
 static int restore_vfp_context(char __user **auxp)
 {
-        struct vfp_sigframe __user *frame =
-                (struct vfp_sigframe __user *)*auxp;
-        unsigned long magic;
-        unsigned long size;
-        int err = 0;
-
-        __get_user_error(magic, &frame->magic, err);
-        __get_user_error(size, &frame->size, err);
+        struct vfp_sigframe frame;
+        int err;
 
+        err = __copy_from_user(&frame, *auxp, sizeof(frame));
         if (err)
-                return -EFAULT;
-        if (magic != VFP_MAGIC || size != VFP_STORAGE_SIZE)
+                return err;
+
+        if (frame.magic != VFP_MAGIC || frame.size != VFP_STORAGE_SIZE)
                 return -EINVAL;
 
-        *auxp += size;
-        return vfp_restore_user_hwstate(&frame->ufp, &frame->ufp_exc);
+        *auxp += sizeof(frame);
+        return vfp_restore_user_hwstate(&frame.ufp, &frame.ufp_exc);
 }
 
 #endif
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 4c375e11ae95..859d50ea17d3 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -597,13 +597,11 @@ int vfp_preserve_user_clear_hwstate(struct user_vfp __user *ufp,
 }
 
 /* Sanitise and restore the current VFP state from the provided structures. */
-int vfp_restore_user_hwstate(struct user_vfp __user *ufp,
-                             struct user_vfp_exc __user *ufp_exc)
+int vfp_restore_user_hwstate(struct user_vfp *ufp, struct user_vfp_exc *ufp_exc)
 {
         struct thread_info *thread = current_thread_info();
         struct vfp_hard_struct *hwstate = &thread->vfpstate.hard;
         unsigned long fpexc;
-        int err = 0;
 
         /* Disable VFP to avoid corrupting the new thread state. */
         vfp_flush_hwstate(thread);
@@ -612,17 +610,16 @@ int vfp_restore_user_hwstate(struct user_vfp __user *ufp,
          * Copy the floating point registers. There can be unused
          * registers see asm/hwcap.h for details.
          */
-        err |= __copy_from_user(&hwstate->fpregs, &ufp->fpregs,
-                                sizeof(hwstate->fpregs));
+        memcpy(&hwstate->fpregs, &ufp->fpregs, sizeof(hwstate->fpregs));
         /*
          * Copy the status and control register.
          */
-        __get_user_error(hwstate->fpscr, &ufp->fpscr, err);
+        hwstate->fpscr = ufp->fpscr;
 
         /*
          * Sanitise and restore the exception registers.
          */
-        __get_user_error(fpexc, &ufp_exc->fpexc, err);
+        fpexc = ufp_exc->fpexc;
 
         /* Ensure the VFP is enabled. */
         fpexc |= FPEXC_EN;
@@ -631,10 +628,10 @@ int vfp_restore_user_hwstate(struct user_vfp __user *ufp,
         fpexc &= ~(FPEXC_EX | FPEXC_FP2V);
         hwstate->fpexc = fpexc;
 
-        __get_user_error(hwstate->fpinst, &ufp_exc->fpinst, err);
-        __get_user_error(hwstate->fpinst2, &ufp_exc->fpinst2, err);
+        hwstate->fpinst = ufp_exc->fpinst;
+        hwstate->fpinst2 = ufp_exc->fpinst2;
 
-        return err ? -EFAULT : 0;
+        return 0;
 }
 
 /*