]> git.baikalelectronics.ru Git - kernel.git/commitdiff
csky: Fixup regs.sr broken in ptrace
authorGuo Ren <guoren@linux.alibaba.com>
Fri, 24 Sep 2021 07:33:38 +0000 (15:33 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Oct 2021 09:40:12 +0000 (11:40 +0200)
commit af89ebaa64de726ca0a39bbb0bf0c81a1f43ad50 upstream.

gpr_get() return the entire pt_regs (include sr) to userspace, if we
don't restore the C bit in gpr_set, it may break the ALU result in
that context. So the C flag bit is part of gpr context, that's why
riscv totally remove the C bit in the ISA. That makes sr reg clear
from userspace to supervisor privilege.

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/csky/kernel/ptrace.c

index 313623a19ecbf6bd3c0e05ca870af9672c6039ea..885194720fe0b01564323cf4057f34ffc3dd029d 100644 (file)
@@ -96,7 +96,8 @@ static int gpr_set(struct task_struct *target,
        if (ret)
                return ret;
 
-       regs.sr = task_pt_regs(target)->sr;
+       /* BIT(0) of regs.sr is Condition Code/Carry bit */
+       regs.sr = (regs.sr & BIT(0)) | (task_pt_regs(target)->sr & ~BIT(0));
 #ifdef CONFIG_CPU_HAS_HILO
        regs.dcsr = task_pt_regs(target)->dcsr;
 #endif