Commit 31e08f2f authored by Mohamed Khalfella's avatar Mohamed Khalfella Committed by sanglipeng
Browse files

tracing/histograms: Return an error if we fail to add histogram to hist_vars list 

stable inclusion
from stable-v5.10.188
commit 43e786aa51b80e5856c8f1c4ad46a5784364ebe6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8KYFP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=43e786aa51b80e5856c8f1c4ad46a5784364ebe6

--------------------------------

commit 4b8b3905 upstream.

Commit 6018b585 ("tracing/histograms: Add histograms to hist_vars if
they have referenced variables") added a check to fail histogram creation
if save_hist_vars() failed to add histogram to hist_vars list. But the
commit failed to set ret to failed return code before jumping to
unregister histogram, fix it.

Link: https://lore.kernel.org/linux-trace-kernel/20230714203341.51396-1-mkhalfella@purestorage.com



Cc: stable@vger.kernel.org
Fixes: 6018b585 ("tracing/histograms: Add histograms to hist_vars if they have referenced variables")
Signed-off-by: default avatarMohamed Khalfella <mkhalfella@purestorage.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 6e1dd8f5

kernel/trace/trace_events_hist.c

+2 −1
Original line number Diff line number Diff line
@@ -5822,7 +5822,8 @@ static int event_hist_trigger_func(struct event_command *cmd_ops, 
		goto out_unreg;



	if (has_hist_vars(hist_data) || hist_data->n_var_refs) {

		if (save_hist_vars(hist_data))

		ret = save_hist_vars(hist_data);

		if (ret)

			goto out_unreg;

	}