]> Pileus Git - ~andy/linux/commitdiff
ring-buffer: Fix crash due to uninitialized new_pages list head
authorVaibhav Nagarnaik <vnagarnaik@google.com>
Fri, 22 Jun 2012 18:50:05 +0000 (11:50 -0700)
committerSteven Rostedt <rostedt@goodmis.org>
Fri, 29 Jun 2012 20:16:35 +0000 (16:16 -0400)
The new_pages list head in the cpu_buffer is not initialized. When
adding pages to the ring buffer, if the memory allocation fails in
ring_buffer_resize, the clean up handler tries to free up the allocated
pages from all the cpu buffers. The panic is caused by referencing the
uninitialized new_pages list head.

Initializing the new_pages list head in rb_allocate_cpu_buffer fixes
this.

Link: http://lkml.kernel.org/r/1340391005-10880-1-git-send-email-vnagarnaik@google.com
Cc: Justin Teravest <teravest@google.com>
Cc: David Sharp <dhsharp@google.com>
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
kernel/trace/ring_buffer.c

index 1d0f6a8a0e5e83680c0df3b28836a5f6a2103a39..ba39cbabdc9fe6f1b94a19047ee994c9f1a511fa 100644 (file)
@@ -1075,6 +1075,7 @@ rb_allocate_cpu_buffer(struct ring_buffer *buffer, int nr_pages, int cpu)
        rb_init_page(bpage->page);
 
        INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
+       INIT_LIST_HEAD(&cpu_buffer->new_pages);
 
        ret = rb_allocate_pages(cpu_buffer, nr_pages);
        if (ret < 0)