summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/stacktrace.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-02 15:02:04 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-02 15:02:04 +0100
commit87ad3722bfef925ac2379257cbc512d77d8c4d44 (patch)
tree6df6210af7e3093c6ba5c99d24e435366fa89675 /arch/x86/kernel/stacktrace.c
parentf235bcfe6a0b678c16517142d906652a7befed73 (diff)
parent30a7acd573899fd8b8ac39236eff6468b195ac7d (diff)
downloadlinux-next-87ad3722bfef925ac2379257cbc512d77d8c4d44.tar.gz
linux-next-87ad3722bfef925ac2379257cbc512d77d8c4d44.zip
Merge 4.15-rc6 into staging-next
We need the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel/stacktrace.c')
-rw-r--r--arch/x86/kernel/stacktrace.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index 77835bc021c7..20161ef53537 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -164,8 +164,12 @@ int save_stack_trace_tsk_reliable(struct task_struct *tsk,
{
int ret;
+ /*
+ * If the task doesn't have a stack (e.g., a zombie), the stack is
+ * "reliably" empty.
+ */
if (!try_get_task_stack(tsk))
- return -EINVAL;
+ return 0;
ret = __save_stack_trace_reliable(trace, tsk);