Commit 9b632635 authored by Thorsten Blum's avatar Thorsten Blum Committed by Steven Rostedt (Google)
Browse files

tracing/synthetic: Fix trace_string() return value 

Fix trace_string() by assigning the string length to the return variable
which got lost in commit ddeea494 ("tracing/synthetic: Use union
instead of casts") and caused trace_string() to always return 0.

Link: https://lore.kernel.org/linux-trace-kernel/20240214220555.711598-1-thorsten.blum@toblux.com



Cc: stable@vger.kernel.org
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fixes: ddeea494 ("tracing/synthetic: Use union instead of casts")
Acked-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarThorsten Blum <thorsten.blum@toblux.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 2394ac41

kernel/trace/trace_events_synth.c

+2 −1
Original line number Diff line number Diff line
@@ -441,8 +441,9 @@ static unsigned int trace_string(struct synth_trace_event *entry, 
	if (is_dynamic) {

		union trace_synth_field *data = &entry->fields[*n_u64];



		len = fetch_store_strlen((unsigned long)str_val);

		data->as_dynamic.offset = struct_size(entry, fields, event->n_u64) + data_size;

		data->as_dynamic.len = fetch_store_strlen((unsigned long)str_val);

		data->as_dynamic.len = len;



		ret = fetch_store_string((unsigned long)str_val, &entry->fields[*n_u64], entry);