summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/unwind_frame.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-05-01 21:49:28 +0200
committerJiri Kosina <jkosina@suse.cz>2017-05-01 21:49:28 +0200
commita0841609f658c77f066af9c61a2e13143564fcb4 (patch)
tree0f0df468b6f852501cd4ed1570701e695b9f5d56 /arch/x86/kernel/unwind_frame.c
parent77f8f39a2e463eca89a19b916189d0e4e38f75d8 (diff)
parente679af627fe875a51d40b9a2b17f08fbde36e0e2 (diff)
downloadlinux-a0841609f658c77f066af9c61a2e13143564fcb4.tar.gz
linux-a0841609f658c77f066af9c61a2e13143564fcb4.tar.bz2
linux-a0841609f658c77f066af9c61a2e13143564fcb4.zip
Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus
Diffstat (limited to 'arch/x86/kernel/unwind_frame.c')
-rw-r--r--arch/x86/kernel/unwind_frame.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/unwind_frame.c b/arch/x86/kernel/unwind_frame.c
index 478d15dbaee4..5ed43910e04b 100644
--- a/arch/x86/kernel/unwind_frame.c
+++ b/arch/x86/kernel/unwind_frame.c
@@ -225,6 +225,8 @@ bool unwind_next_frame(struct unwind_state *state)
return true;
bad_address:
+ state->error = true;
+
/*
* When unwinding a non-current task, the task might actually be
* running on another CPU, in which case it could be modifying its