xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
commit 4b8b3905165ef98386a3c06f196c85d21292d029 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mohamed Khalfella
2023-07-14 20:33:41 +00:00
committed by Greg Kroah-Hartman
parent e3da59f428
commit 43e786aa51
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/trace/trace_events_hist.c
View File

@@ -5822,7 +5822,8 @@ static int event_hist_trigger_func(struct event_command *cmd_ops,
goto out_unreg; goto out_unreg;
if (has_hist_vars(hist_data) || hist_data->n_var_refs) { 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; goto out_unreg;
} }