diff options
| author | Kees Cook <keescook@chromium.org> | 2021-09-29 15:02:14 -0700 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-10-15 11:25:14 +0200 |
| commit | 42a20f86dc19f9282d974df0ba4d226c865ab9dd (patch) | |
| tree | 548e09e31785a53f7907e0e4c28471d0e53fcbb5 /arch/sh | |
| parent | bc9bbb81730ea667c31c5b284f95ee312bab466f (diff) | |
| download | linux-42a20f86dc19f9282d974df0ba4d226c865ab9dd.tar.gz | |
sched: Add wrapper for get_wchan() to keep task blocked
Having a stable wchan means the process must be blocked and for it to stay that way while performing stack unwinding. Suggested-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> [arm] Tested-by: Mark Rutland <mark.rutland@arm.com> [arm64] Link: https://lkml.kernel.org/r/20211008111626.332092234@infradead.org
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/processor_32.h | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/process_32.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h index aa92cc933889..45240ec6b85a 100644 --- a/arch/sh/include/asm/processor_32.h +++ b/arch/sh/include/asm/processor_32.h @@ -180,7 +180,7 @@ static inline void show_code(struct pt_regs *regs) } #endif -extern unsigned long get_wchan(struct task_struct *p); +extern unsigned long __get_wchan(struct task_struct *p); #define KSTK_EIP(tsk) (task_pt_regs(tsk)->pc) #define KSTK_ESP(tsk) (task_pt_regs(tsk)->regs[15]) diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c index 717de05c81f4..1c28e3cddb60 100644 --- a/arch/sh/kernel/process_32.c +++ b/arch/sh/kernel/process_32.c @@ -182,13 +182,10 @@ __switch_to(struct task_struct *prev, struct task_struct *next) return prev; } -unsigned long get_wchan(struct task_struct *p) +unsigned long __get_wchan(struct task_struct *p) { unsigned long pc; - if (!p || p == current || task_is_running(p)) - return 0; - /* * The same comment as on the Alpha applies here, too ... */ |