tracing: fix mmiotrace resizing crash
authorIngo Molnar <mingo@elte.hu>
Thu, 13 Nov 2008 13:58:31 +0000 (14:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 13 Nov 2008 13:58:31 +0000 (14:58 +0100)
Pekka reported a crash when resizing the mmiotrace tracer (if only
mmiotrace is enabled).

This happens because in that case we do not allocate the max buffer,
but we try to use it.

Make ring_buffer_resize() idempotent against NULL buffers.

Reported-by: Pekka Paalanen <pq@iki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/ring_buffer.c

index 231db209fa82137461efbd51eb15a8061d6437a6..036456cbb4f7e1ceecf929e37ed6de581866abda 100644 (file)
@@ -538,6 +538,12 @@ int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size)
        LIST_HEAD(pages);
        int i, cpu;
 
+       /*
+        * Always succeed at resizing a non-existent buffer:
+        */
+       if (!buffer)
+               return size;
+
        size = DIV_ROUND_UP(size, BUF_PAGE_SIZE);
        size *= BUF_PAGE_SIZE;
        buffer_size = buffer->pages * BUF_PAGE_SIZE;