From: Chris Metcalf Date: Sat, 10 Aug 2013 16:22:43 +0000 (-0400) Subject: tile: don't call show_regs_print_info() with corrupt current X-Git-Tag: v3.12-rc1~120^2~28 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4036c7d3542ce82ea343bf95dd05ca46aefba9aa;p=platform%2Fkernel%2Flinux-exynos.git tile: don't call show_regs_print_info() with corrupt current We use the validate_current() API to make sure that "current" seems plausible before using it. With the new show_regs_print_info() API, we want to check that current is OK before calling it, since otherwise we will end up in a recursive panic. Signed-off-by: Chris Metcalf --- diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c index 663289b..44cdc4a 100644 --- a/arch/tile/kernel/process.c +++ b/arch/tile/kernel/process.c @@ -226,19 +226,20 @@ int get_unalign_ctl(struct task_struct *tsk, unsigned long adr) (unsigned int __user *)adr); } +static struct task_struct corrupt_current = { .comm = "" }; + /* * Return "current" if it looks plausible, or else a pointer to a dummy. * This can be helpful if we are just trying to emit a clean panic. */ struct task_struct *validate_current(void) { - static struct task_struct corrupt = { .comm = "" }; struct task_struct *tsk = current; if (unlikely((unsigned long)tsk < PAGE_OFFSET || (high_memory && (void *)tsk > high_memory) || ((unsigned long)tsk & (__alignof__(*tsk) - 1)) != 0)) { pr_err("Corrupt 'current' %p (sp %#lx)\n", tsk, stack_pointer); - tsk = &corrupt; + tsk = &corrupt_current; } return tsk; } @@ -589,7 +590,8 @@ void show_regs(struct pt_regs *regs) int i; pr_err("\n"); - show_regs_print_info(KERN_ERR); + if (tsk != &corrupt_current) + show_regs_print_info(KERN_ERR); #ifdef __tilegx__ for (i = 0; i < 17; i++) pr_err(" r%-2d: "REGFMT" r%-2d: "REGFMT" r%-2d: "REGFMT"\n",