Skip to content

Commit 6170922

Browse files
vdonnefortrostedt
authored andcommitted
ring-buffer: Prevent off-by-one array access in ring_buffer_desc_page()
As pointed out by Smatch, the ring-buffer descriptor array page_va is counted by nr_page_va, but the accessor ring_buffer_desc_page() allows access off by one. Currently, this does not cause problems, as the page ID always comes from a trusted source. Nonetheless, ensure robustness and fix the accessor. While at it, make the page_id unsigned. Link: https://patch.msgid.link/20260410124527.3563970-1-vdonnefort@google.com Reported-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Vincent Donnefort <vdonnefort@google.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 1111e9b commit 6170922

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

kernel/trace/ring_buffer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2238,9 +2238,9 @@ static struct ring_buffer_desc *ring_buffer_desc(struct trace_buffer_desc *trace
22382238
return NULL;
22392239
}
22402240

2241-
static void *ring_buffer_desc_page(struct ring_buffer_desc *desc, int page_id)
2241+
static void *ring_buffer_desc_page(struct ring_buffer_desc *desc, unsigned int page_id)
22422242
{
2243-
return page_id > desc->nr_page_va ? NULL : (void *)desc->page_va[page_id];
2243+
return page_id >= desc->nr_page_va ? NULL : (void *)desc->page_va[page_id];
22442244
}
22452245

22462246
static int __rb_allocate_pages(struct ring_buffer_per_cpu *cpu_buffer,

0 commit comments

Comments
 (0)