diff options
| author | Konstantin Khlebnikov <k.khlebnikov@samsung.com> | 2013-12-05 13:30:10 +0000 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-04-16 21:36:40 +0900 |
| commit | dd9c791908188f12f477e103c611bb1299cd0b28 (patch) | |
| tree | 83846468d983e78495701b52b39833d31b1025b1 | |
| parent | d5f3b89293d924d81147411da50a8a19ccfef201 (diff) | |
| download | linux-3.10-dd9c791908188f12f477e103c611bb1299cd0b28.tar.gz linux-3.10-dd9c791908188f12f477e103c611bb1299cd0b28.tar.bz2 linux-3.10-dd9c791908188f12f477e103c611bb1299cd0b28.zip | |
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 <k.khlebnikov@samsung.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rw-r--r-- | arch/arm64/kernel/process.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 5837ca22896..d312399f07a 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -311,6 +311,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; @@ -318,9 +319,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; |