ring-buffer: Fix subbuf_ids memory leak in rb_allocate_cpu_buffer() error path
Subsystems (2)
Masami Hiramatsu (Google)
maintainerPATCH v2 1/1 ring-buffer: Fix subbuf_ids memory leak in rb_allocate_cpu_buffer() error path
From: Masami Hiramatsu (Google) <[email protected]>
In rb_allocate_cpu_buffer(), cpu_buffer->subbuf_ids is allocated using kcalloc() when buffer->remote is non-NULL. If a subsequent page allocation fails (e.g., ring_buffer_desc_page() returns NULL or rb_allocate_pages() fails), execution jumps to fail_free_reader.
While __free(kfree) automatically frees the outer cpu_buffer structure at scope exit, kfree(cpu_buffer) does not recursively free nested heap pointers such as cpu_buffer->subbuf_ids, resulting in a memory leak.
Fix this by explicitly freeing cpu_buffer->subbuf_ids in the fail_free_reader error unwinding path when cpu_buffer->remote is set.
---
Changes in v2:
- Call kfree(subbuf_ids) unconditionally because it should be NULL if !remote.
--- kernel/trace/ring_buffer.c | 1 + 1 file changed, 1 insertion(+)
kernel/trace/ring_buffer.c +1 -0
@@ -2599,6 +2599,7 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu)return_ptr (cpu_buffer); fail_free_reader: +kfree (cpu_buffer->subbuf_ids);free_buffer_page (cpu_buffer->reader_page);return NULL ;
Quoted 31 lines · Masami Hiramatsu (Google)
From: Masami Hiramatsu (Google) <[email protected]>
In
rb_allocate_cpu_buffer(),cpu_buffer->subbuf_idsis allocated usingkcalloc()whenbuffer->remoteis non-NULL. If a subsequent page allocation fails (e.g.,ring_buffer_desc_page()returns NULL orrb_allocate_pages()fails), execution jumps tofail_free_reader.While
__free(kfree)automatically frees the outercpu_bufferstructure at scope exit,kfree(cpu_buffer)does not recursively free nested heap pointers such ascpu_buffer->subbuf_ids, resulting in a memory leak.Fix this by explicitly freeing
cpu_buffer->subbuf_idsin thefail_free_readererror unwinding path whencpu_buffer->remoteis set.Fixes 2e67fabd8b77 ("ring-buffer: Introduce ring-buffer remotes")Assisted-by Antigravity:gemini-3.6-flashSigned-off-by Masami Hiramatsu (Google) <[email protected]>---
Changes in v2:
- Callkfree(subbuf_ids)unconditionally because it should be NULL if !remote.--- kernel/trace/ring_buffer.c | 1 + 1 file changed, 1 insertion(+)kernel/trace/ring_buffer.c +0
-0
kernel/trace/ring_buffer.c rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu) · line 2605
Quoted 7 lines
kernel/trace/ring_buffer.c +1
-0@@ -2599,6 +2599,7 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu)return_ptr (cpu_buffer); fail_free_reader: +kfree (cpu_buffer->subbuf_ids);free_buffer_page (cpu_buffer->reader_page);return NULL ;
Thanks!
Signature · 1 line
Vincent