Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 4fb5741c7c5d · 2019-06-02T11:04:42.000-07:00
Pull stacktrace fix from Ingo Molnar:
 "Fix a stack_trace_save_tsk_reliable() regression"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  stacktrace: Unbreak stack_trace_save_tsk_reliable()
diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c
@@ -207,7 +207,7 @@ int stack_trace_save_tsk_reliable(struct task_struct *tsk, unsigned long *store,
 
 	ret = arch_stack_walk_reliable(consume_entry, &c, tsk);
 	put_task_stack(tsk);
-	return ret;
+	return ret ? ret : c.len;
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ int stack_trace_save_tsk_reliable(struct task_struct tsk, unsigned long store,`
`207`	`207`
`208`	`208`	`ret = arch_stack_walk_reliable(consume_entry, &c, tsk);`
`209`	`209`	`put_task_stack(tsk);`
`210`		`- return ret;`
	`210`	`+ return ret ? ret : c.len;`
`211`	`211`	`}`
`212`	`212`	`#endif`
`213`	`213`