sh: Fix ptrace fpu state initialisation

Commit 0ea820cf introduced the PTRACE_GETFPREGS/SETFPREGS cmds,
but gdb-server still accesses the FPU state using the
PTRACE_PEEKUSR/POKEUSR commands. In this case, xstate was not
initialised.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Cc: stable@kernel.org
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index 90a15d29feebdceb4aa019bc7cc8e4f649f08721..b53664ef53e841e5758bd69b789d39e4ef9621f5 100644 (file)
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -392,6 +392,9 @@ long arch_ptrace(struct task_struct *child, long request,
                                        tmp = 0;
                        } else {
                                unsigned long index;
+                               ret = init_fpu(child);
+                               if (ret)
+                                       break;
                                index = addr - offsetof(struct user, fpu);
                                tmp = ((unsigned long *)child->thread.xstate)
                                        [index >> 2];
@@ -423,6 +426,9 @@ long arch_ptrace(struct task_struct *child, long request,
                else if (addr >= offsetof(struct user, fpu) &&
                         addr < offsetof(struct user, u_fpvalid)) {
                        unsigned long index;
+                       ret = init_fpu(child);
+                       if (ret)
+                               break;
                        index = addr - offsetof(struct user, fpu);
                        set_stopped_child_used_math(child);
                        ((unsigned long *)child->thread.xstate)

diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
index 4436eacddb1536e6aaf5a00299a659dc12a210c6..c8f97649f354b5f4b80366b79a95c9a9a0f4d4bb 100644 (file)
--- a/arch/sh/kernel/ptrace_64.c
+++ b/arch/sh/kernel/ptrace_64.c
@@ -403,6 +403,9 @@ long arch_ptrace(struct task_struct *child, long request,
                else if ((addr >= offsetof(struct user, fpu)) &&
                         (addr <  offsetof(struct user, u_fpvalid))) {
                        unsigned long index;
+                       ret = init_fpu(child);
+                       if (ret)
+                               break;
                        index = addr - offsetof(struct user, fpu);
                        tmp = get_fpu_long(child, index);
                } else if (addr == offsetof(struct user, u_fpvalid)) {
@@ -442,6 +445,9 @@ long arch_ptrace(struct task_struct *child, long request,
                else if ((addr >= offsetof(struct user, fpu)) &&
                         (addr <  offsetof(struct user, u_fpvalid))) {
                        unsigned long index;
+                       ret = init_fpu(child);
+                       if (ret)
+                               break;
                        index = addr - offsetof(struct user, fpu);
                        ret = put_fpu_long(child, index, data);
                }