linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] perf tools: Fix NULL vs IS_ERR_OR_NULL() checking
@ 2021-12-11  5:38 Miaoqian Lin
  2021-12-11 11:25 ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 2+ messages in thread
From: Miaoqian Lin @ 2021-12-11  5:38 UTC (permalink / raw)
  Cc: linmq006, Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
	Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
	Song Liu, linux-perf-users, linux-kernel

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>
---
 tools/perf/util/python.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index 563a9ba8954f..7f782a31bda3 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -461,7 +461,7 @@ get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name)
 		struct tep_event *tp_format;
 
 		tp_format = trace_event__tp_format_id(evsel->core.attr.config);
-		if (!tp_format)
+		if (IS_ERR_OR_NULL(tp_format))
 			return NULL;
 
 		evsel->tp_format = tp_format;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] perf tools: Fix NULL vs IS_ERR_OR_NULL() checking
  2021-12-11  5:38 [PATCH] perf tools: Fix NULL vs IS_ERR_OR_NULL() checking Miaoqian Lin
@ 2021-12-11 11:25 ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 2+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-12-11 11:25 UTC (permalink / raw)
  To: Miaoqian Lin
  Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
	Jiri Olsa, Namhyung Kim, Song Liu, linux-perf-users, linux-kernel

Em Sat, Dec 11, 2021 at 05:38:53AM +0000, Miaoqian Lin escreveu:
> The function trace_event__tp_format_id may return ERR_PTR(-ENOMEM).
> Use IS_ERR_OR_NULL to check tp_format.

Thanks, applied.

- Arnaldo

 
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
>  tools/perf/util/python.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
> index 563a9ba8954f..7f782a31bda3 100644
> --- a/tools/perf/util/python.c
> +++ b/tools/perf/util/python.c
> @@ -461,7 +461,7 @@ get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name)
>  		struct tep_event *tp_format;
>  
>  		tp_format = trace_event__tp_format_id(evsel->core.attr.config);
> -		if (!tp_format)
> +		if (IS_ERR_OR_NULL(tp_format))
>  			return NULL;
>  
>  		evsel->tp_format = tp_format;
> -- 
> 2.17.1

-- 

- Arnaldo

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-12-11 11:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-11  5:38 [PATCH] perf tools: Fix NULL vs IS_ERR_OR_NULL() checking Miaoqian Lin
2021-12-11 11:25 ` Arnaldo Carvalho de Melo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).