]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
tracing: Initialize scratch_size to zero to prevent UB
authorSteven Rostedt <rostedt@goodmis.org>
Thu, 13 Mar 2025 11:16:18 +0000 (07:16 -0400)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Fri, 28 Mar 2025 12:39:56 +0000 (08:39 -0400)
In allocate_trace_buffer() the following code:

  buf->buffer = ring_buffer_alloc_range(size, rb_flags, 0,
      tr->range_addr_start,
      tr->range_addr_size,
      struct_size(tscratch, entries, 128));

  tscratch = ring_buffer_meta_scratch(buf->buffer, &scratch_size);
  setup_trace_scratch(tr, tscratch, scratch_size);

Has undefined behavior if ring_buffer_alloc_range() fails because
"scratch_size" is not initialize. If the allocation fails, then
buf->buffer will be NULL. The ring_buffer_meta_scratch() will return
NULL immediately if it is passed a NULL buffer and it will not update
scratch_size. Then setup_trace_scratch() will return immediately if
tscratch is NULL.

Although there's no real issue here, but it is considered undefined
behavior to pass an uninitialized variable to a function as input, and
UBSan may complain about it.

Just initialize scratch_size to zero to make the code defined behavior and
a little more robust.

Link: https://lore.kernel.org/all/44c5deaa-b094-4852-90f9-52f3fb10e67a@stanley.mountain/
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
kernel/trace/trace.c

index 7f8b0c43d2a5063cfc0d7778ef2f4df148f1e0aa..78ae76666695321a13bfeaaf71dc85490a427110 100644 (file)
@@ -9398,7 +9398,7 @@ allocate_trace_buffer(struct trace_array *tr, struct array_buffer *buf, int size
 {
        enum ring_buffer_flags rb_flags;
        struct trace_scratch *tscratch;
-       unsigned int scratch_size;
+       unsigned int scratch_size = 0;
 
        rb_flags = tr->trace_flags & TRACE_ITER_OVERWRITE ? RB_FL_OVERWRITE : 0;