diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-08 09:49:43 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-08 09:49:43 (GMT) |
| commit | 56d94d70398f0fbb1863a03a145db1a86f009a71 (patch) | |
| tree | 9e52dc537f8f8359c70b66f5000192bb280b41b9 /kernel/trace/trace_stack.c | |
| parent | bb63f726f98bec032c7322a9c36eb4167307d856 (diff) | |
| parent | fc4f000bf8c0cbf38f44de6bd5e225574e572ed4 (diff) | |
| download | linux-56d94d70398f0fbb1863a03a145db1a86f009a71.tar.xz | |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'kernel/trace/trace_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 202df6c..2a1abba 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c @@ -156,7 +156,11 @@ check_stack(unsigned long ip, unsigned long *stack) for (; p < top && i < stack_trace_max.nr_entries; p++) { if (stack_dump_trace[i] == ULONG_MAX) break; - if (*p == stack_dump_trace[i]) { + /* + * The READ_ONCE_NOCHECK is used to let KASAN know that + * this is not a stack-out-of-bounds error. + */ + if ((READ_ONCE_NOCHECK(*p)) == stack_dump_trace[i]) { stack_dump_trace[x] = stack_dump_trace[i++]; this_size = stack_trace_index[x++] = (top - p) * sizeof(unsigned long); |