2016-04-23 10:24:19

by Dan Carpenter

Subject: [patch] tracing: checking for NULL instead of IS_ERR()

tracing_map_elt_alloc() returns ERR_PTRs on error, never NULL.

Fixes: 08d43a5fa063 ('tracing: Add lock-free tracing_map')
Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
index e0f1729..e7dfc5e 100644
--- a/kernel/trace/tracing_map.c
+++ b/kernel/trace/tracing_map.c
@@ -814,7 +814,7 @@ static struct tracing_map_elt *copy_elt(struct tracing_map_elt *elt)
unsigned int i;

dup_elt = tracing_map_elt_alloc(elt->map);
- if (!dup_elt)
+ if (IS_ERR(dup_elt))
return NULL;

if (elt->map->ops && elt->map->ops->elt_copy)

2016-04-25 18:59:42

by Tom Zanussi

Subject: Re: [patch] tracing: checking for NULL instead of IS_ERR()

Hi Dan,

On 04/23/2016 05:23 AM, Dan Carpenter wrote:
> tracing_map_elt_alloc() returns ERR_PTRs on error, never NULL.
>
> Fixes: 08d43a5fa063 ('tracing: Add lock-free tracing_map')
> Signed-off-by: Dan Carpenter <[email protected]>
>
> diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
> index e0f1729..e7dfc5e 100644
> --- a/kernel/trace/tracing_map.c
> +++ b/kernel/trace/tracing_map.c
> @@ -814,7 +814,7 @@ static struct tracing_map_elt *copy_elt(struct tracing_map_elt *elt)
> unsigned int i;
>
> dup_elt = tracing_map_elt_alloc(elt->map);
> - if (!dup_elt)
> + if (IS_ERR(dup_elt))
> return NULL;
>
> if (elt->map->ops && elt->map->ops->elt_copy)
>

Thanks for fixing this. I found another one along the same lines which
I'll send a patch for shortly.

Acked-by: Tom Zanussi <[email protected]>

2016-04-26 13:41:12

by Steven Rostedt

Subject: Re: [patch] tracing: checking for NULL instead of IS_ERR()

On Mon, 25 Apr 2016 13:59:32 -0500
Tom Zanussi <[email protected]> wrote:

> Hi Dan,
>
> On 04/23/2016 05:23 AM, Dan Carpenter wrote:
> > tracing_map_elt_alloc() returns ERR_PTRs on error, never NULL.
> >
> > Fixes: 08d43a5fa063 ('tracing: Add lock-free tracing_map')
> > Signed-off-by: Dan Carpenter <[email protected]>
> >

>
> Acked-by: Tom Zanussi <[email protected]>

Applied.

Thanks Dan and Tom,

-- Steve