[for-next][PATCH 12/14] tracing/boot: Fix an IS_ERR() vs NULL bug
From: Steven Rostedt
Date: Fri Jan 24 2020 - 10:17:41 EST
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
The trace_array_get_by_name() function doesn't return error pointers,
it returns NULL on error.
Link: http://lkml.kernel.org/r/20200117053007.5h2juv272pokqhtq@xxxxxxxxxxxxx
Fixes: 4f712a4d04a4 ("tracing/boot: Add instance node support")
Acked-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
kernel/trace/trace_boot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
index fa9603dc6469..cd541ac1cbc1 100644
--- a/kernel/trace/trace_boot.c
+++ b/kernel/trace/trace_boot.c
@@ -322,7 +322,7 @@ trace_boot_init_instances(struct xbc_node *node)
continue;
tr = trace_array_get_by_name(p);
- if (IS_ERR(tr)) {
+ if (!tr) {
pr_err("Failed to get trace instance %s\n", p);
continue;
}
--
2.24.1