Commit 8f0f5c4f authored by Masami Hiramatsu (Google)'s avatar Masami Hiramatsu (Google) Committed by Steven Rostedt
Browse files

tracing: Do not call map->ops->elt_free() if elt_alloc() fails 

In paths where tracing_map_elt_alloc() failed to allocate objects,
the map->ops->elt_alloc() call was never successful. In this case,
map->ops->elt_free() should not be called.

Link: https://sashiko.dev/#/patchset/20260520223101.34710-1-rosenp%40gmail.com



Cc: stable@vger.kernel.org
Cc: Tom Zanussi <tom.zanussi@linux.intel.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Rosen Penev <rosenp@gmail.com>
Reported-by: default avatarSashiko <sashiko-bot@kernel.org>
Fixes: 2734b629 ("tracing: Add per-element variable support to tracing_map")
Link: https://patch.msgid.link/177933895460.108746.5396070821443932634.stgit@devnote2


Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 576ec047

kernel/trace/tracing_map.c

+13 −4
Original line number Diff line number Diff line
@@ -386,13 +386,11 @@ static void tracing_map_elt_init_fields(struct tracing_map_elt *elt) 
	}

}



static void tracing_map_elt_free(struct tracing_map_elt *elt)

static void __tracing_map_elt_free(struct tracing_map_elt *elt)

{

	if (!elt)

		return;



	if (elt->map->ops && elt->map->ops->elt_free)

		elt->map->ops->elt_free(elt);

	kfree(elt->fields);

	kfree(elt->vars);

	kfree(elt->var_set);
@@ -400,6 +398,17 @@ static void tracing_map_elt_free(struct tracing_map_elt *elt) 
	kfree(elt);

}



static void tracing_map_elt_free(struct tracing_map_elt *elt)

{

	if (!elt)

		return;



	/* Only objects initialized with alloc_elt() should be passed to free_elt().*/

	if (elt->map->ops && elt->map->ops->elt_free)

		elt->map->ops->elt_free(elt);

	__tracing_map_elt_free(elt);

}



static struct tracing_map_elt *tracing_map_elt_alloc(struct tracing_map *map)

{

	struct tracing_map_elt *elt;
@@ -444,7 +453,7 @@ static struct tracing_map_elt *tracing_map_elt_alloc(struct tracing_map *map) 
	}

	return elt;

 free:

	tracing_map_elt_free(elt);

	__tracing_map_elt_free(elt);



	return ERR_PTR(err);

}