]> git.hungrycats.org Git - linux/commitdiff
MIPS: Avoid using unwind_stack() with usermode
authorJames Hogan <james.hogan@imgtec.com>
Fri, 4 Dec 2015 22:25:02 +0000 (22:25 +0000)
committerSasha Levin <sasha.levin@oracle.com>
Fri, 3 Jun 2016 15:30:38 +0000 (11:30 -0400)
[ Upstream commit 81a76d7119f63c359750e4adeff922a31ad1135f ]

When showing backtraces in response to traps, for example crashes and
address errors (usually unaligned accesses) when they are set in debugfs
to be reported, unwind_stack will be used if the PC was in the kernel
text address range. However since EVA it is possible for user and kernel
address ranges to overlap, and even without EVA userland can still
trigger an address error by jumping to a KSeg0 address.

Adjust the check to also ensure that it was running in kernel mode. I
don't believe any harm can come of this problem, since unwind_stack() is
sufficiently defensive, however it is only meant for unwinding kernel
code, so to be correct it should use the raw backtracing instead.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Reviewed-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 3.15+
Patchwork: https://patchwork.linux-mips.org/patch/11701/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
(cherry picked from commit d2941a975ac745c607dfb590e92bb30bc352dad9)
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
arch/mips/kernel/traps.c

index 2012a5a3055b1926c3d8694a52b3227d00b881f9..afa366b01ae71cc80ea2a22df5dd4f0b0e17a96c 100644 (file)
@@ -141,7 +141,7 @@ static void show_backtrace(struct task_struct *task, const struct pt_regs *regs)
        if (!task)
                task = current;
 
-       if (raw_show_trace || !__kernel_text_address(pc)) {
+       if (raw_show_trace || user_mode(regs) || !__kernel_text_address(pc)) {
                show_raw_backtrace(sp);
                return;
        }