[tip:tracing/urgent] ring-buffer: Wrap a list.next reference with rb_list_head()

From: tip-bot for David Sharp
Date: Sat Jan 09 2010 - 17:38:29 EST

Commit-ID: 5ded3dc6a3c7549b36a8ac27bbd81b33756a2c29
Gitweb: http://git.kernel.org/tip/5ded3dc6a3c7549b36a8ac27bbd81b33756a2c29
Author: David Sharp <dhsharp@xxxxxxxxxx>
AuthorDate: Wed, 6 Jan 2010 17:12:07 -0800
Committer: Steven Rostedt <rostedt@xxxxxxxxxxx>
CommitDate: Wed, 6 Jan 2010 20:38:25 -0500

ring-buffer: Wrap a list.next reference with rb_list_head()

This reference at the end of rb_get_reader_page() was causing off-by-one
writes to the prev pointer of the page after the reader page when that
page is the head page, and therefore the reader page has the RB_PAGE_HEAD
flag in its list.next pointer. This eventually results in a GPF in a
subsequent call to rb_set_head_page() (usually from rb_get_reader_page())
when that prev pointer is dereferenced. The dereferenced register would
characteristically have an address that appears shifted left by one byte
(eg, ffxxxxxxxxxxxxyy instead of ffffxxxxxxxxxxxx) due to being written at
an address one byte too high.

Signed-off-by: David Sharp <dhsharp@xxxxxxxxxx>
LKML-Reference: <1262826727-9090-1-git-send-email-dhsharp@xxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
kernel/trace/ring_buffer.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 2326b04..d5b7308 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2906,7 +2906,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
* Now make the new head point back to the reader page.
- reader->list.next->prev = &cpu_buffer->reader_page->list;
+ rb_list_head(reader->list.next)->prev = &cpu_buffer->reader_page->list;
rb_inc_page(cpu_buffer, &cpu_buffer->head_page);

/* Finally update the reader page to the new head */
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/