aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-05-06 12:40:51 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-05-06 12:49:20 -0400
commit00c81a58c5b4e0de14ee33bfbc3d71c90f69f9ea (patch)
treed34d323e0a3b67ee5ce4c0ae8a0b3dbbc9bf2562 /kernel/trace
parent8e7abf1c62941ebb7a1416cbc62392c8a0902625 (diff)
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 <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/ring_buffer_benchmark.c3
1 files changed, 3 insertions, 0 deletions
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)
84 int i; 84 int i;
85 85
86 bpage = ring_buffer_alloc_read_page(buffer); 86 bpage = ring_buffer_alloc_read_page(buffer);
87 if (!bpage)
88 return EVENT_DROPPED;
89
87 ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1); 90 ret = ring_buffer_read_page(buffer, &bpage, PAGE_SIZE, cpu, 1);
88 if (ret >= 0) { 91 if (ret >= 0) {
89 rpage = bpage; 92 rpage = bpage;