Skip to content

Commit 7433632

Browse files
committed
ring-buffer: Check for NULL cpu_buffer in ring_buffer_wake_waiters()
On some machines the number of listed CPUs may be bigger than the actual CPUs that exist. The tracing subsystem allocates a per_cpu directory with access to the per CPU ring buffer via a cpuX file. But to save space, the ring buffer will only allocate buffers for online CPUs, even though the CPU array will be as big as the nr_cpu_ids. With the addition of waking waiters on the ring buffer when closing the file, the ring_buffer_wake_waiters() now needs to make sure that the buffer is allocated (with the irq_work allocated with it) before trying to wake waiters, as it will cause a NULL pointer dereference. While debugging this, I added a NULL check for the buffer itself (which is OK to do), and also NULL pointer checks against buffer->buffers (which is not fine, and will WARN) as well as making sure the CPU number passed in is within the nr_cpu_ids (which is also not fine if it isn't). Link: https://lore.kernel.org/all/[email protected]/ Link: https://lore.kernel.org/all/CAM6Wdxc0KRJMXVAA0Y=u6Jh2V=uWB-_Fn6M4xRuNppfXzL1mUg@mail.gmail.com/ Link: https://lkml.kernel.org/linux-trace-kernel/[email protected] Cc: [email protected] Cc: Steven Noonan <[email protected]> Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=1204705 Reported-by: Takashi Iwai <[email protected]> Reported-by: Roland Ruckerbauer <[email protected]> Fixes: f3ddb74 ("tracing: Wake up ring buffer waiters on closing of the file") Reviewed-by: Masami Hiramatsu (Google) <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 30a0b95 commit 7433632

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

kernel/trace/ring_buffer.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -937,6 +937,9 @@ void ring_buffer_wake_waiters(struct trace_buffer *buffer, int cpu)
937937
struct ring_buffer_per_cpu *cpu_buffer;
938938
struct rb_irq_work *rbwork;
939939

940+
if (!buffer)
941+
return;
942+
940943
if (cpu == RING_BUFFER_ALL_CPUS) {
941944

942945
/* Wake up individual ones too. One level recursion */
@@ -945,7 +948,15 @@ void ring_buffer_wake_waiters(struct trace_buffer *buffer, int cpu)
945948

946949
rbwork = &buffer->irq_work;
947950
} else {
951+
if (WARN_ON_ONCE(!buffer->buffers))
952+
return;
953+
if (WARN_ON_ONCE(cpu >= nr_cpu_ids))
954+
return;
955+
948956
cpu_buffer = buffer->buffers[cpu];
957+
/* The CPU buffer may not have been initialized yet */
958+
if (!cpu_buffer)
959+
return;
949960
rbwork = &cpu_buffer->irq_work;
950961
}
951962

0 commit comments

Comments
 (0)