[PATCH v1 1/9] ring-buffer: Always read buffer->buffers after testing the cpumask

From: Vincent Donnefort

Date: Thu Nov 12 2026 - 09:53:37 EST


ring_buffer_reset_cpu() reads buffer->buffers[cpu] before testing the
cpumask. If trace_rb_cpu_prepare() sets the bit in between, the cpumask
check passes while cpu_buffer contains a stale value. Read
buffer->buffers[cpu] after the cpumask test passes.

While ring_buffer_peek() and ring_buffer_read_page() cannot hit this
race because callers already check the cpumask, apply the same pattern
for consistency.

Fixes: 554f786e284a ("ring-buffer: only allocate buffers for online cpus")
Signed-off-by: Vincent Donnefort <vdonnefort@xxxxxxxxxx>
---
kernel/trace/ring_buffer.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 1fd28a72e6ee..bd8126f6353b 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -6340,7 +6340,7 @@ struct ring_buffer_event *
ring_buffer_peek(struct trace_buffer *buffer, int cpu, u64 *ts,
unsigned long *lost_events)
{
- struct ring_buffer_per_cpu *cpu_buffer = buffer->buffers[cpu];
+ struct ring_buffer_per_cpu *cpu_buffer;
struct ring_buffer_event *event;
unsigned long flags;
bool dolock;
@@ -6348,6 +6348,8 @@ ring_buffer_peek(struct trace_buffer *buffer, int cpu, u64 *ts,
if (!cpumask_test_cpu(cpu, buffer->cpumask))
return NULL;

+ cpu_buffer = buffer->buffers[cpu];
+
again:
local_irq_save(flags);
dolock = rb_reader_lock(cpu_buffer);
@@ -6740,11 +6742,13 @@ static void reset_disabled_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer)
*/
void ring_buffer_reset_cpu(struct trace_buffer *buffer, int cpu)
{
- struct ring_buffer_per_cpu *cpu_buffer = buffer->buffers[cpu];
+ struct ring_buffer_per_cpu *cpu_buffer;

if (!cpumask_test_cpu(cpu, buffer->cpumask))
return;

+ cpu_buffer = buffer->buffers[cpu];
+
/* prevent another thread from changing buffer sizes */
mutex_lock(&buffer->mutex);

@@ -7198,7 +7202,7 @@ int ring_buffer_read_page(struct trace_buffer *buffer,
struct buffer_data_read_page *data_page,
size_t len, int cpu, int full)
{
- struct ring_buffer_per_cpu *cpu_buffer = buffer->buffers[cpu];
+ struct ring_buffer_per_cpu *cpu_buffer;
struct ring_buffer_event *event;
struct buffer_data_page *dpage;
struct buffer_page *reader;
@@ -7211,6 +7215,8 @@ int ring_buffer_read_page(struct trace_buffer *buffer,
if (!cpumask_test_cpu(cpu, buffer->cpumask))
return -1;

+ cpu_buffer = buffer->buffers[cpu];
+
/*
* If len is not big enough to hold the page header, then
* we can not copy anything.
--
2.56.0.567.gdb80ae8cd5-goog