tracing/histograms: Return an error if we fail to add histogram to hist_vars list
authorMohamed Khalfella <mkhalfella@purestorage.com>
Fri, 14 Jul 2023 20:33:41 +0000 (20:33 +0000)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Sun, 23 Jul 2023 15:18:52 +0000 (11:18 -0400)
Commit 6018b585e8c6 ("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: 6018b585e8c6 ("tracing/histograms: Add histograms to hist_vars if they have referenced variables")
Signed-off-by: Mohamed Khalfella <mkhalfella@purestorage.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
kernel/trace/trace_events_hist.c

index c8c61381eba48397393d5361c2dec5bfa50782a3..d06938ae071740ea4c80cff055c29a6c5db1352f 100644 (file)
@@ -6668,7 +6668,8 @@ static int event_hist_trigger_parse(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;
        }