Skip to content

Commit 9937e8d

Browse files
Yuuoniyacmel
authored andcommitted
perf python: Fix NULL vs IS_ERR_OR_NULL() checking
The function trace_event__tp_format_id may return ERR_PTR(-ENOMEM). Use IS_ERR_OR_NULL to check tp_format. Signed-off-by: Miaoqian Lin <linmq006@gmail.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Song Liu <song@kernel.org> Link: http://lore.kernel.org/lkml/20211211053856.19827-1-linmq006@gmail.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 6665b8e commit 9937e8d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tools/perf/util/python.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name)
461461
struct tep_event *tp_format;
462462

463463
tp_format = trace_event__tp_format_id(evsel->core.attr.config);
464-
if (!tp_format)
464+
if (IS_ERR_OR_NULL(tp_format))
465465
return NULL;
466466

467467
evsel->tp_format = tp_format;

0 commit comments

Comments
 (0)