ring-buffer: Fixes for 7.1
Subsystems (2)
cover ring-buffer: Fixes for 7.1
git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
ring-buffer/for-next
Head SHA1: 6170922f137231b98fc568571befef63e1edff3f
Cao Ruichuang (1):
ring-buffer: Report header_page overwrite as char
Vincent Donnefort (1):
ring-buffer: Prevent off-by-one array access in ring_buffer_desc_page()
----
kernel/trace/ring_buffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
PATCH 1/2 ring-buffer: Report header_page overwrite as char
From: Cao Ruichuang <[email protected]>
The header_page tracefs metadata currently reports overwrite as an int field with size 1. That makes parsers warn about a type and size mismatch even though the field is only used as a one-byte flag within commit.
Keep the shared offset with commit as-is, but report overwrite as char so the declared type matches the hardcoded size. The signedness is already carried separately by the emitted signed field.
--- kernel/trace/ring_buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/ring_buffer.c +2 -2
@@ -597,11 +597,11 @@ int ring_buffer_print_page_header(struct trace_buffer *buffer, struct trace_seq (unsigned int )sizeof (field.commit), (unsigned int)is_signed_type(long)); -trace_seq_printf (s,"\tfield: int overwrite;\t" +trace_seq_printf (s,"\tfield: char overwrite;\t" "offset:%u;\tsize:%u;\tsigned:%u;\n" , (unsigned int )offsetof(typeof (field ), commit),1 , - (unsigned int )is_signed_type (long)); + (unsigned int )is_signed_type (char)); trace_seq_printf(s, "\tfield: char data;\t" "offset:%u;\tsize:%u;\tsigned:%u;\n",
Signature · 1 line
2.51.0
PATCH 2/2 ring-buffer: Prevent off-by-one array access in ring_buffer_desc_page()
In reply to Steven RostedtFrom: Vincent Donnefort <[email protected]>
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.
--- kernel/trace/ring_buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/ring_buffer.c +2 -2
@@ -2238,9 +2238,9 @@ static struct ring_buffer_desc *ring_buffer_desc(struct trace_buffer_desc *tracereturn NULL ; } -static void *ring_buffer_desc_page (struct ring_buffer_desc *desc,int page_id) +static void *ring_buffer_desc_page (struct ring_buffer_desc *desc,unsigned int page_id) { -return page_id > desc->nr_page_va ?NULL : (void *)desc->page_va[page_id]; +return page_id >= desc->nr_page_va ?NULL : (void *)desc->page_va[page_id]; } static int __rb_allocate_pages(struct ring_buffer_per_cpu *cpu_buffer,
Signature · 1 line
2.51.0