powerpc/ptrace: Hard wire PT_SOFTE value to 1 in gpr_get() too

The commit a8a4b03ab95f ("powerpc: Hard wire PT_SOFTE value to 1 in
ptrace & signals") changed ptrace_get_reg(PT_SOFTE) to report 0x1,
but PTRACE_GETREGS still copies pt_regs->softe as is.

This is not consistent and this breaks the user-regs-peekpoke test
from https://sourceware.org/systemtap/wiki/utrace/tests/

Reported-by: Jan Kratochvil <jan.kratochvil@redhat.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201119160247.GB5188@redhat.com

diff --git a/arch/powerpc/kernel/ptrace/ptrace-tm.c b/arch/powerpc/kernel/ptrace/ptrace-tm.c
index f15cbbab45b714c595fdb5035dd0ef090015c092..44045363a9035ce6d77798e04936db3438a9bd50 100644 (file)
--- a/arch/powerpc/kernel/ptrace/ptrace-tm.c
+++ b/arch/powerpc/kernel/ptrace/ptrace-tm.c
@@ -87,6 +87,9 @@ int tm_cgpr_get(struct task_struct *target, const struct user_regset *regset,
                struct membuf to)
 {
        struct membuf to_msr = membuf_at(&to, offsetof(struct pt_regs, msr));
+#ifdef CONFIG_PPC64
+       struct membuf to_softe = membuf_at(&to, offsetof(struct pt_regs, softe));
+#endif
 
        if (!cpu_has_feature(CPU_FTR_TM))
                return -ENODEV;
@@ -101,7 +104,9 @@ int tm_cgpr_get(struct task_struct *target, const struct user_regset *regset,
        membuf_write(&to, &target->thread.ckpt_regs, sizeof(struct user_pt_regs));
 
        membuf_store(&to_msr, get_user_ckpt_msr(target));
-
+#ifdef CONFIG_PPC64
+       membuf_store(&to_softe, 0x1ul);
+#endif
        return membuf_zero(&to, ELF_NGREG * sizeof(unsigned long) -
                        sizeof(struct user_pt_regs));
 }

diff --git a/arch/powerpc/kernel/ptrace/ptrace-view.c b/arch/powerpc/kernel/ptrace/ptrace-view.c
index 299e0b6d709db77013232f0d8c39771dc193b600..142d58337f40d8c1894752ee518da8f6e69e0fb4 100644 (file)
--- a/arch/powerpc/kernel/ptrace/ptrace-view.c
+++ b/arch/powerpc/kernel/ptrace/ptrace-view.c
@@ -218,6 +218,9 @@ static int gpr_get(struct task_struct *target, const struct user_regset *regset,
                   struct membuf to)
 {
        struct membuf to_msr = membuf_at(&to, offsetof(struct pt_regs, msr));
+#ifdef CONFIG_PPC64
+       struct membuf to_softe = membuf_at(&to, offsetof(struct pt_regs, softe));
+#endif
        int i;
 
        if (target->thread.regs == NULL)
@@ -232,7 +235,9 @@ static int gpr_get(struct task_struct *target, const struct user_regset *regset,
        membuf_write(&to, target->thread.regs, sizeof(struct user_pt_regs));
 
        membuf_store(&to_msr, get_user_msr(target));
-
+#ifdef CONFIG_PPC64
+       membuf_store(&to_softe, 0x1ul);
+#endif
        return membuf_zero(&to, ELF_NGREG * sizeof(unsigned long) -
                                 sizeof(struct user_pt_regs));
 }