Skip to content

Commit 3e4272b

Browse files
XidianGeneralrostedt
authored andcommitted
tracing: Add NULL checks for buffer in ring_buffer_free_read_page()
In a previous commit 7433632, buffer, buffer->buffers and buffer->buffers[cpu] in ring_buffer_wake_waiters() can be NULL, and thus the related checks are added. However, in the same call stack, these variables are also used in ring_buffer_free_read_page(): tracing_buffers_release() ring_buffer_wake_waiters(iter->array_buffer->buffer) cpu_buffer = buffer->buffers[cpu] -> Add checks by previous commit ring_buffer_free_read_page(iter->array_buffer->buffer) cpu_buffer = buffer->buffers[cpu] -> No check Thus, to avod possible null-pointer derefernces, the related checks should be added. These results are reported by a static tool designed by myself. Link: https://lkml.kernel.org/r/20230113125501.760324-1-baijiaju1990@gmail.com Reported-by: TOTE Robot <oslab@tsinghua.edu.cn> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent b56c68f commit 3e4272b

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

kernel/trace/ring_buffer.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5626,11 +5626,16 @@ EXPORT_SYMBOL_GPL(ring_buffer_alloc_read_page);
56265626
*/
56275627
void ring_buffer_free_read_page(struct trace_buffer *buffer, int cpu, void *data)
56285628
{
5629-
struct ring_buffer_per_cpu *cpu_buffer = buffer->buffers[cpu];
5629+
struct ring_buffer_per_cpu *cpu_buffer;
56305630
struct buffer_data_page *bpage = data;
56315631
struct page *page = virt_to_page(bpage);
56325632
unsigned long flags;
56335633

5634+
if (!buffer || !buffer->buffers || !buffer->buffers[cpu])
5635+
return;
5636+
5637+
cpu_buffer = buffer->buffers[cpu];
5638+
56345639
/* If the page is still in use someplace else, we can't reuse it */
56355640
if (page_ref_count(page) > 1)
56365641
goto out;

0 commit comments

Comments
 (0)