tracing/remotes: Fix leak in trace_remote_alloc_buffer() error path
Subsystems (2)
Vincent Donnefort
maintainerv2 cover tracing/remotes: Fix leak in trace_remote_alloc_buffer() error path
This series addresses a few issues in the trace remote buffers allocation and descriptor handling, mostly reported by Sashiko bot on top of v1.
Changelog:
v1 -> v2:
- Leak fix: increment nr_cpus early (after meta_va allocation) instead of in the error path.
- Added struct_len double-counting fix.
- Added sparse CPU masks support in ring_buffer_desc().
v1: https://lore.kernel.org/all/[email protected]/
Vincent Donnefort (3):
tracing/remotes: Fix leak in trace_remote_alloc_buffer() error path tracing/remotes: Fix struct_len in trace_remote_alloc_buffer()
ring-buffer: Allow sparse CPU masks in ring_buffer_desc()
kernel/trace/ring_buffer.c | 5 +---- kernel/trace/trace_remote.c | 18 ++++++------------ 2 files changed, 7 insertions(+), 16 deletions(-)
base-commit: 8cdeaa50eae8dad34885515f62559ee83e7e8dda
Signature · 1 line
2.55.0.795.g602f6c329a-goog
Vincent Donnefort
maintainerPATCH v2 1/3 tracing/remotes: Fix leak in trace_remote_alloc_buffer() error path
If page allocation fails in trace_remote_alloc_buffer(), desc->nr_cpus is not yet incremented for the current CPU. As a consequence, on error, half-allocated rb_desc will not be freed in trace_remote_free_buffer().
Increment desc->nr_cpus as soon as the first allocation for the current CPU has succeeded.
kernel/trace/trace_remote.c +2 -1
@@ -1006,6 +1006,8 @@ int trace_remote_alloc_buffer(struct trace_buffer_desc *desc, size_t desc_size,if (!rb_desc->meta_va) goto err; + desc->nr_cpus++; +for (id =0 ; id < nr_pages; id++) { rb_desc->page_va[id] = (unsigned long )__get_free_page (GFP_KERNEL );if (!rb_desc->page_va[id])
@@ -1013,7 +1015,6 @@ int trace_remote_alloc_buffer(struct trace_buffer_desc *desc, size_t desc_size, rb_desc->nr_page_va++; } - desc->nr_cpus++; desc->struct_len += offsetof(struct ring_buffer_desc , page_va); desc->struct_len +=struct_size (rb_desc, page_va, rb_desc->nr_page_va); rb_desc =__next_ring_buffer_desc (rb_desc);
Signature · 1 line
2.55.0.795.g602f6c329a-goog
Steven Rostedt
maintainerQuoted 10 lines · On Thu, 9 Jul 2026 17:00:15 +0100 Vincent Donnefort <[email protected]>…
If page allocation fails in
trace_remote_alloc_buffer(),desc->nr_cpusis not yet incremented for the current CPU. As a consequence, on error, half-allocatedrb_descwill not be freed intrace_remote_free_buffer().Increment
desc->nr_cpusas soon as the first allocation for the current CPU has succeeded.Fixes 96e43537af54 ("tracing: Introduce trace remotes")Reported-by Sashiko <[email protected]>Signed-off-by Vincent Donnefort <[email protected]>
This patch makes Sashiko find other possible issues with the code :-p
https://sashiko.dev/#/patchset/20260709160017.1729517-2-vdonnefort%40google.com
-- Steve
Vincent Donnefort
maintainerQuoted 10 lines · Steven Rostedt
Quoted 7 lines · On Thu, 9 Jul 2026 17:00:15 +0100 Vincent Donnefort <[email protected]>…
If page allocation fails in
trace_remote_alloc_buffer(),desc->nr_cpusis not yet incremented for the current CPU. As a consequence, on error, half-allocatedrb_descwill not be freed intrace_remote_free_buffer().Increment
desc->nr_cpusas soon as the first allocation for the current CPU has succeeded.
Quoted 7 lines
Quoted 3 lines
Fixes 96e43537af54 ("tracing: Introduce trace remotes")Reported-by Sashiko <[email protected]>Signed-off-by Vincent Donnefort <[email protected]>This patch makes Sashiko find other possible issues with the code :-p
https://sashiko.dev/#/patchset/20260709160017.1729517-2-vdonnefort%40google.com
So one of them is fixed as part of "tracing/remotes: Add printk, dump_on_panic and boot parameters" [1]. I can pull those fixes into this series instead.
I'll look at the rest.
[1] https://lore.kernel.org/all/[email protected]/
Quoted 2 lines
-- Steve
Vincent Donnefort
maintainerQuoted 15 lines · Vincent Donnefort
Quoted 14 lines · Steven Rostedt
Quoted 10 lines · On Thu, 9 Jul 2026 17:00:15 +0100 Vincent Donnefort <[email protected]>…
If page allocation fails in
trace_remote_alloc_buffer(),desc->nr_cpusis not yet incremented for the current CPU. As a consequence, on error, half-allocatedrb_descwill not be freed intrace_remote_free_buffer().Increment
desc->nr_cpusas soon as the first allocation for the current CPU has succeeded.Fixes 96e43537af54 ("tracing: Introduce trace remotes")Reported-by Sashiko <[email protected]>Signed-off-by Vincent Donnefort <[email protected]>
Quoted 8 lines
Quoted 3 lines
This patch makes Sashiko find other possible issues with the code :-p
https://sashiko.dev/#/patchset/20260709160017.1729517-2-vdonnefort%40google.com
So one of them is fixed as part of "tracing/remotes: Add printk,
dump_on_panicand boot parameters" [1]. I can pull those fixes into this series instead.I'll look at the rest.
Ha yes this other one is real too. However this is in arch/arm64/kvm/ so I'll post it separately to kvmarm.
Quoted 5 lines
[1] https://lore.kernel.org/all/[email protected]/
Quoted 2 lines
-- Steve
Vincent Donnefort
maintainerQuoted 20 lines · Vincent Donnefort
Quoted 19 lines · Vincent Donnefort
Quoted 17 lines · Steven Rostedt
Quoted 10 lines · On Thu, 9 Jul 2026 17:00:15 +0100 Vincent Donnefort <[email protected]>…
If page allocation fails in
trace_remote_alloc_buffer(),desc->nr_cpusis not yet incremented for the current CPU. As a consequence, on error, half-allocatedrb_descwill not be freed intrace_remote_free_buffer().Increment
desc->nr_cpusas soon as the first allocation for the current CPU has succeeded.Fixes 96e43537af54 ("tracing: Introduce trace remotes")Reported-by Sashiko <[email protected]>Signed-off-by Vincent Donnefort <[email protected]>This patch makes Sashiko find other possible issues with the code :-p
https://sashiko.dev/#/patchset/20260709160017.1729517-2-vdonnefort%40google.com
Quoted 7 lines
Quoted 4 lines
So one of them is fixed as part of "tracing/remotes: Add printk,
dump_on_panicand boot parameters" [1]. I can pull those fixes into this series instead.I'll look at the rest.
Ha yes this other one is real too. However this is in
arch/arm64/kvm/so I'll post it separately to kvmarm.
Posted here: https://lore.kernel.org/all/[email protected]/
Let me know if I should fold [1] into this series.
Quoted 6 lines
Quoted 6 lines
[1] https://lore.kernel.org/all/[email protected]/
Quoted 2 lines
-- Steve
Steven Rostedt
maintainerQuoted 6 lines · On Fri, 10 Jul 2026 12:56:32 +0100 Vincent Donnefort <[email protected]>…
Quoted 2 lines
Ha yes this other one is real too. However this is in
arch/arm64/kvm/so I'll post it separately to kvmarm.Posted here: https://lore.kernel.org/all/[email protected]/
Let me know if I should fold [1] into this series.
If they are separate, I'll pull this series in now and start testing it.
I just wanted to know if these would cause you to rethink this series.
-- Steve
Vincent Donnefort
maintainerPATCH v2 2/3 tracing/remotes: Fix struct_len in trace_remote_alloc_buffer()
In reply to Vincent DonnefortPre-calculate desc->struct_len up-front in trace_remote_alloc_buffer() with trace_buffer_desc_size() to fix double-counting.
While at it, use the accessor __first_ring_buffer_desc().
kernel/trace/trace_remote.c +4 -11
@@ -979,27 +979,22 @@ EXPORT_SYMBOL_GPL(trace_remote_free_buffer);int trace_remote_alloc_buffer (struct trace_buffer_desc *desc,size_t desc_size,size_t buffer_size,const struct cpumask *cpumask) { +size_t min_desc_size =trace_buffer_desc_size (buffer_size,cpumask_weight (cpumask));unsigned int nr_pages =max (DIV_ROUND_UP (buffer_size,PAGE_SIZE ),2UL ) +1 ; -void *desc_end = desc + desc_size;struct ring_buffer_desc *rb_desc;int cpu, ret = -ENOMEM ; -if (desc_size <struct_size (desc, __data,0 )) +if (desc_size < min_desc_size)return -EINVAL ; desc->nr_cpus =0 ; - desc->struct_len =struct_size (desc, __data,0 ); + desc->struct_len = min_desc_size; - rb_desc = (struct ring_buffer_desc *)&desc->__data[0 ]; + rb_desc =__first_ring_buffer_desc (desc);for_each_cpu (cpu, cpumask) {unsigned int id; -if ((void *)rb_desc +struct_size (rb_desc, page_va, nr_pages) > desc_end) { - ret = -EINVAL ; - goto err; - } - rb_desc->cpu = cpu; rb_desc->nr_page_va =0 ; rb_desc->meta_va = (unsigned long )__get_free_page (GFP_KERNEL );
@@ -1015,8 +1010,6 @@ int trace_remote_alloc_buffer(struct trace_buffer_desc *desc, size_t desc_size, rb_desc->nr_page_va++; } - desc->struct_len += offsetof(struct ring_buffer_desc , page_va); - desc->struct_len +=struct_size (rb_desc, page_va, rb_desc->nr_page_va); rb_desc =__next_ring_buffer_desc (rb_desc); }
Signature · 1 line
2.55.0.795.g602f6c329a-goog
Vincent Donnefort
maintainerPATCH v2 3/3 ring-buffer: Allow sparse CPU masks in ring_buffer_desc()
In reply to Vincent DonnefortNo user currently relies on sparse CPU masks, but the descriptor logic already supports them via linear fallback. Remove the arbitrary limitation.
kernel/trace/ring_buffer.c +1 -4
@@ -2329,10 +2329,7 @@ static struct ring_buffer_desc *ring_buffer_desc(struct trace_buffer_desc *tracesize_t len;int i; -if (!trace_desc) -return NULL ; - -if (cpu >= trace_desc->nr_cpus) +if (!trace_desc || !trace_desc->nr_cpus)return NULL ; end = (struct ring_buffer_desc *)((void *)trace_desc + trace_desc->struct_len);
Signature · 1 line
2.55.0.795.g602f6c329a-goog