]> git.hungrycats.org Git - linux/commitdiff
ARM: fix PTRACE_SETVFPREGS on SMP systems
authorRussell King <rmk+kernel@armlinux.org.uk>
Mon, 30 May 2016 22:14:56 +0000 (23:14 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 22 Aug 2016 21:37:13 +0000 (22:37 +0100)
commit e2dfb4b880146bfd4b6aa8e138c0205407cebbaf upstream.

PTRACE_SETVFPREGS fails to properly mark the VFP register set to be
reloaded, because it undoes one of the effects of vfp_flush_hwstate().

Specifically vfp_flush_hwstate() sets thread->vfpstate.hard.cpu to
an invalid CPU number, but vfp_set() overwrites this with the original
CPU number, thereby rendering the hardware state as apparently "valid",
even though the software state is more recent.

Fix this by reverting the previous change.

Fixes: 8130b9d7b9d8 ("ARM: 7308/1: vfp: flush thread hwstate before copying ptrace registers")
Acked-by: Will Deacon <will.deacon@arm.com>
Tested-by: Simon Marchi <simon.marchi@ericsson.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/arm/kernel/ptrace.c

index 90fa8b36b6123fbd1d7e8a049c9c091d8e707176..8b17fb452af84ed8292aaf62946cfebf49dc3b3d 100644 (file)
@@ -726,8 +726,8 @@ static int vfp_set(struct task_struct *target,
        if (ret)
                return ret;
 
-       vfp_flush_hwstate(thread);
        thread->vfpstate.hard = new_vfp;
+       vfp_flush_hwstate(thread);
 
        return 0;
 }