[PATCH 2/2] x86/stacktrace: make sure reliable stack trace reached userspace

[Jiri Slaby]

Make sure that save_stack_trace_reliable reached userspace when saying
"this stack trace is reliable."

Place this check only after stack unwinding error check, so that the
stack is printed if something really went wrong during unwinding.

Signed-off-by: Jiri Slaby <jslaby@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: x86@xxxxxxxxxx
Cc: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
---
 arch/x86/kernel/stacktrace.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index 221a03e251bb..2153aff1b459 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -98,6 +98,7 @@ __save_stack_trace_reliable(struct stack_trace *trace,
 	struct unwind_state state;
 	struct pt_regs *regs;
 	unsigned long addr;
+	bool reached_user = false;
 
 	for (unwind_start(&state, task, NULL, NULL); !unwind_done(&state);
 	     unwind_next_frame(&state)) {
@@ -117,6 +118,7 @@ __save_stack_trace_reliable(struct stack_trace *trace,
 				STACKTRACE_DUMP_ONCE(task);
 				return -EINVAL;
 			}
+			reached_user = true;
 			break;
 		}
 
@@ -142,6 +144,9 @@ __save_stack_trace_reliable(struct stack_trace *trace,
 		return -EINVAL;
 	}
 
+	if (!reached_user)
+		return -EINVAL;
+
 	if (trace->nr_entries < trace->max_entries)
 		trace->entries[trace->nr_entries++] = ULONG_MAX;
 
-- 
2.15.0