From: Steven Rostedt Date: Wed, 6 May 2009 16:40:51 +0000 (-0400) Subject: ring-buffer: check for failed allocation in ring buffer benchmark X-Git-Tag: v2.6.31-rc1~401^2~72 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=00c81a58c5b4e0de14ee33bfbc3d71c90f69f9ea;p=karo-tx-linux.git ring-buffer: check for failed allocation in ring buffer benchmark The result of the allocation of the ring buffer read page in the ring buffer bench mark does not check the return to see if a page was actually allocated. This patch fixes that. [ Impact: avoid NULL dereference ] Signed-off-by: Steven Rostedt --- diff --git a/kernel/trace/ring_buffer_benchmark.c b/kernel/trace/ring_buffer_benchmark.c index 747244acb8fd..dcd75e9e49f4 100644 --- a/kernel/trace/ring_buffer_benchmark.c +++ b/kernel/trace/ring_buffer_benchmark.c @@ -84,6 +84,9 @@ static enum event_status read_page(int cpu) int i; bpage = ring_buffer_alloc_read_page(buffer); + if (!bpage) + return EVENT_DROPPED; + ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1); if (ret >= 0) { rpage = bpage;