summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos López <clopez@suse.de>2024-05-27 12:43:52 +0300
committerMasami Hiramatsu (Google) <mhiramat@kernel.org>2024-05-27 15:32:35 +0300
commite569eb34970281438e2b48a3ef11c87459fcfbcb (patch)
tree77dd40ae3cd73360c2fb250b2d3b2984cd11efcf
parent699646734ab51bf5b1cd4a7a30c20074f6e74f6e (diff)
downloadlinux-e569eb34970281438e2b48a3ef11c87459fcfbcb.tar.xz
tracing/probes: fix error check in parse_btf_field()
btf_find_struct_member() might return NULL or an error via the ERR_PTR() macro. However, its caller in parse_btf_field() only checks for the NULL condition. Fix this by using IS_ERR() and returning the error up the stack. Link: https://lore.kernel.org/all/20240527094351.15687-1-clopez@suse.de/ Fixes: c440adfbe3025 ("tracing/probes: Support BTF based data structure field access") Signed-off-by: Carlos López <clopez@suse.de> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
-rw-r--r--kernel/trace/trace_probe.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 5e263c141574..39877c80d6cb 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -554,6 +554,10 @@ static int parse_btf_field(char *fieldname, const struct btf_type *type,
anon_offs = 0;
field = btf_find_struct_member(ctx->btf, type, fieldname,
&anon_offs);
+ if (IS_ERR(field)) {
+ trace_probe_log_err(ctx->offset, BAD_BTF_TID);
+ return PTR_ERR(field);
+ }
if (!field) {
trace_probe_log_err(ctx->offset, NO_BTF_FIELD);
return -ENOENT;