[PATCH 1/2] tracing/probes: Fix to return NULL and keep using current argc

From: Masami Hiramatsu (Google)
Date: Sat Jun 03 2023 - 22:29:18 EST


From: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>

Fix to return NULL and keep using current argc when there is
$argN and the BTF is not available.

Reported-by: kernel test robot <lkp@xxxxxxxxx>
Closes: https://lore.kernel.org/oe-kbuild-all/202306030940.Cej2JoUx-lkp@xxxxxxxxx/
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
---
kernel/trace/trace_probe.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index ba1c6e059b51..473e1c43bc57 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -1273,7 +1273,8 @@ const char **traceprobe_expand_meta_args(int argc, const char *argv[],
trace_probe_log_err(0, NOSUP_BTFARG);
return (const char **)params;
}
- return 0;
+ *new_argc = argc;
+ return NULL;
}
ctx->params = params;
ctx->nr_params = nr_params;