Commit 34423f25 authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware)
Browse files

tracing: Fix uninitialized buffer var on early exit to trace_vbprintk() 



If we exit due to a bad input to trace_printk() (highly unlikely), then the
buffer variable will not be initialized when we unnest the ring buffer.

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 532f49a6

kernel/trace/trace.c

+2 −1
Original line number Diff line number Diff line
@@ -3230,7 +3230,7 @@ int trace_vbprintk(unsigned long ip, const char *fmt, va_list args) 
	len = vbin_printf((u32 *)tbuffer, TRACE_BUF_SIZE/sizeof(int), fmt, args);



	if (len > TRACE_BUF_SIZE/sizeof(int) || len < 0)

		goto out;

		goto out_put;



	local_save_flags(flags);

	size = sizeof(*entry) + sizeof(u32) * len;
@@ -3252,6 +3252,7 @@ int trace_vbprintk(unsigned long ip, const char *fmt, va_list args) 


out:

	ring_buffer_nest_end(buffer);

out_put:

	put_trace_buf();



out_nobuffer:

CRA Git | Maintained and supported by SUSTech CRA and CCSE