提交 408c3658 编写于 作者: K Konstantin Khlebnikov 提交者: Catalin Marinas

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: NKonstantin Khlebnikov <k.khlebnikov@samsung.com>
Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
上级 50afc33a
...@@ -308,6 +308,7 @@ struct task_struct *__switch_to(struct task_struct *prev, ...@@ -308,6 +308,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
unsigned long get_wchan(struct task_struct *p) unsigned long get_wchan(struct task_struct *p)
{ {
struct stackframe frame; struct stackframe frame;
unsigned long stack_page;
int count = 0; int count = 0;
if (!p || p == current || p->state == TASK_RUNNING) if (!p || p == current || p->state == TASK_RUNNING)
return 0; return 0;
...@@ -315,9 +316,11 @@ unsigned long get_wchan(struct task_struct *p) ...@@ -315,9 +316,11 @@ unsigned long get_wchan(struct task_struct *p)
frame.fp = thread_saved_fp(p); frame.fp = thread_saved_fp(p);
frame.sp = thread_saved_sp(p); frame.sp = thread_saved_sp(p);
frame.pc = thread_saved_pc(p); frame.pc = thread_saved_pc(p);
stack_page = (unsigned long)task_stack_page(p);
do { do {
int ret = unwind_frame(&frame); if (frame.sp < stack_page ||
if (ret < 0) frame.sp >= stack_page + THREAD_SIZE ||
unwind_frame(&frame))
return 0; return 0;
if (!in_sched_functions(frame.pc)) if (!in_sched_functions(frame.pc))
return frame.pc; return frame.pc;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册