Commit 545db7e2 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Steven Rostedt (Google)
Browse files

tracing/histograms: Simplify last_cmd_set() 

Turn a kzalloc()+strcpy()+strncat() into an equivalent and less verbose
kasprintf().

Link: https://lore.kernel.org/linux-trace-kernel/30b6fb04dadc10a03cc1ad08f5d8a93ef623a167.1697899346.git.christophe.jaillet@wanadoo.fr



Cc: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarMukesh ojha <quic_mojha@quicinc.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 845e31e1

kernel/trace/trace_events_hist.c

+2 −9
Original line number Diff line number Diff line
@@ -774,23 +774,16 @@ static void last_cmd_set(struct trace_event_file *file, char *str) 
{

	const char *system = NULL, *name = NULL;

	struct trace_event_call *call;

	int len;



	if (!str)

		return;



	/* sizeof() contains the nul byte */

	len = sizeof(HIST_PREFIX) + strlen(str);

	kfree(last_cmd);

	last_cmd = kzalloc(len, GFP_KERNEL);



	last_cmd = kasprintf(GFP_KERNEL, HIST_PREFIX "%s", str);

	if (!last_cmd)

		return;



	strcpy(last_cmd, HIST_PREFIX);

	/* Again, sizeof() contains the nul byte */

	len -= sizeof(HIST_PREFIX);

	strncat(last_cmd, str, len);



	if (file) {

		call = file->event_call;

		system = call->class->system;