summaryrefslogtreecommitdiff
path: root/kernel/trace
diff options
context:
space:
mode:
authorZheng Yejian <zhengyejian1@huawei.com>2022-12-07 11:46:35 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-01-14 10:16:33 +0100
commitb838b1b9ca700859153642a5a184c83923c56bba (patch)
treedd4dd48ccc589a6f7b10c7dc179263a649420402 /kernel/trace
parentff3dd2c1befe48da9eb9d4042fa3aede31156a12 (diff)
downloadlinux-b838b1b9ca700859153642a5a184c83923c56bba.tar.gz
linux-b838b1b9ca700859153642a5a184c83923c56bba.tar.bz2
linux-b838b1b9ca700859153642a5a184c83923c56bba.zip
tracing/hist: Fix wrong return value in parse_action_params()
commit 2cc6a528882d0e0ccbc1bca5f95b8c963cedac54 upstream. When number of synth fields is more than SYNTH_FIELDS_MAX, parse_action_params() should return -EINVAL. Link: https://lore.kernel.org/linux-trace-kernel/20221207034635.2253990-1-zhengyejian1@huawei.com Cc: <mhiramat@kernel.org> Cc: <zanussi@kernel.org> Cc: stable@vger.kernel.org Fixes: c282a386a397 ("tracing: Add 'onmatch' hist trigger action support") Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace_events_hist.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
index 9bf2bea373d4..0ae3e4454ff2 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
@@ -3115,6 +3115,7 @@ static int parse_action_params(struct trace_array *tr, char *params,
while (params) {
if (data->n_params >= SYNTH_FIELDS_MAX) {
hist_err(tr, HIST_ERR_TOO_MANY_PARAMS, 0);
+ ret = -EINVAL;
goto out;
}