diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 44004d8aa3b3..4373d71bb4fd 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2799,11 +2799,17 @@ static char *get_trace_buf(void) if (!buffer || buffer->nesting >= 4) return NULL; - return &buffer->buffer[buffer->nesting++][0]; + buffer->nesting++; + + /* Interrupts must see nesting incremented before we use the buffer */ + barrier(); + return &buffer->buffer[buffer->nesting][0]; } static void put_trace_buf(void) { + /* Don't let the decrement of nesting leak before this */ + barrier(); this_cpu_dec(trace_percpu_buffer->nesting); }