From: Konstantin Khlebnikov Date: Thu, 5 Dec 2013 13:30:10 +0000 (+0000) Subject: ARM64: check stack pointer in get_wchan X-Git-Tag: firefly_0821_release~3680^2~35^2~1^2~60 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a62c1e2a0a220b20d942e0cc0ca204347b7b7aa6;p=firefly-linux-kernel-4.4.55.git ARM64: check stack pointer in get_wchan get_wchan() is lockless. Task may wakeup at any time and change its own stack, thus each next stack frame may be overwritten and filled with random stuff. Signed-off-by: Konstantin Khlebnikov Signed-off-by: Catalin Marinas (cherry picked from commit 408c3658b0d49315974ce8b5aed385c8e1527595) Signed-off-by: Mark Brown --- diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index adc68bf21d8b..02a41bba165d 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -308,6 +308,7 @@ struct task_struct *__switch_to(struct task_struct *prev, unsigned long get_wchan(struct task_struct *p) { struct stackframe frame; + unsigned long stack_page; int count = 0; if (!p || p == current || p->state == TASK_RUNNING) return 0; @@ -315,9 +316,11 @@ unsigned long get_wchan(struct task_struct *p) frame.fp = thread_saved_fp(p); frame.sp = thread_saved_sp(p); frame.pc = thread_saved_pc(p); + stack_page = (unsigned long)task_stack_page(p); do { - int ret = unwind_frame(&frame); - if (ret < 0) + if (frame.sp < stack_page || + frame.sp >= stack_page + THREAD_SIZE || + unwind_frame(&frame)) return 0; if (!in_sched_functions(frame.pc)) return frame.pc;