diff options
| author |   Steven Rostedt <srostedt@redhat.com> | 2010-08-16 11:17:30 -0400 |
|---|---|---|
| committer |   Steven Rostedt <rostedt@goodmis.org> | 2010-08-16 11:17:30 -0400 |
| commit | d244b6bd41e09ecbb09c738cc2c108be227398c8 (patch) | |
| tree | 848c6a8a0d6f83929daf43d63e241dc8072066ac /kernel/trace/ring_buffer.c | |
| parent | Linux 2.6.36-rc1 (diff) | |
| parent | tracing: Sanitize value returned from write(trace_marker, "...", len) (diff) | |
| download | linux-dev-d244b6bd41e09ecbb09c738cc2c108be227398c8.tar.xz linux-dev-d244b6bd41e09ecbb09c738cc2c108be227398c8.zip | |
Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4
Conflicts:
kernel/trace/trace_events.c
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 3632ce87674f..19cccc3c3028 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -3846,6 +3846,9 @@ int ring_buffer_read_page(struct ring_buffer *buffer, rpos = reader->read; pos += size; + if (rpos >= commit) + break; + event = rb_reader_event(cpu_buffer); size = rb_event_length(event); } while (len > size); |