All of lore.kernel.org
 help / color / mirror / Atom feed
From: Julia Lawall <julia@diku.dk>
To: Ryan Mallon <ryan@bluewatersys.com>
Cc: Russell King <linux@arm.linux.org.uk>,
	kernel-janitors@vger.kernel.org,
	Nicolas Ferre <nicolas.ferre@atmel.com>,
	Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
	Andrew Victor <linux@maxim.org.za>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/4] arch/arm/mach-at91/clock.c: Add missing IS_ERR test
Date: Mon, 24 Jan 2011 21:00:59 +0100 (CET)	[thread overview]
Message-ID: <Pine.LNX.4.64.1101242058430.3167@ask.diku.dk> (raw)
In-Reply-To: <4D3DD964.9020107@bluewatersys.com>

On Tue, 25 Jan 2011, Ryan Mallon wrote:

> On 01/25/2011 08:55 AM, Julia Lawall wrote:
> > Function clk_get, defined just below this code, returns ERR_PTR not NULL in
> > an error case.
> > 
> > The semantic match that finds this problem is as follows:
> > (http://coccinelle.lip6.fr/)
> > 
> > // <smpl>
> > @r@
> > identifier f;
> > @@
> > f(...) { ... return ERR_PTR(...); }
> > 
> > @@
> > identifier r.f, fld;
> > expression x;
> > statement S1,S2;
> > @@
> >  x = f(...)
> >  ... when != IS_ERR(x)
> > (
> >  if (IS_ERR(x) ||...) S1 else S2
> > |
> > *x->fld
> > )
> > // </smpl>
> 
> I'm always really impressed by this tool :-).
> 
> > 
> > Signed-off-by: Julia Lawall <julia@diku.dk>
> > 
> > ---
> >  arch/arm/mach-at91/clock.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> > index 9113da6..c9ee6d0 100644
> > --- a/arch/arm/mach-at91/clock.c
> > +++ b/arch/arm/mach-at91/clock.c
> > @@ -224,7 +224,7 @@ void __init at91_clock_associate(const char *id, struct device *dev, const char
> >  {
> >  	struct clk *clk = clk_get(NULL, id);
> >  
> > -	if (!dev || !clk || !IS_ERR(clk_get(dev, func)))
> > +	if (!dev || IS_ERR(clk) || !IS_ERR(clk_get(dev, func)))
> >  		return;
> 
> I think we want:
> 
> 	if (!dev || !clk || IS_ERR(clk) || !IS_ERR(clk_get(dev, func)))
> 		return;
> 
> Since it is valid to return a NULL clk, and we don't want to try and
> dereference it if that is the case.

Looking at the given defintion of clk_get, I can't see how that could 
happen:

struct clk *clk_get(struct device *dev, const char *id)
{
        struct clk *clk;

        list_for_each_entry(clk, &clocks, node) {
                if (strcmp(id, clk->name) == 0)
                        return clk;
                if (clk->function && (dev == clk->dev) && strcmp(id, clk->function) == 0)
                        return clk;
        }

        return ERR_PTR(-ENOENT);
}

Both paths to the non-ERR_PTR return dereference clk.

julia

> We could also probably drop the !IS_ERR(clk_get(dev, func)) check, since
> as far as I can tell it is just checking to see if the clock is already
> associated, but there is no harm in re-assigning the same values, and
> the two assignments in at91_clock_associate are going to be much quicker
> than the lookup in clk_get.
> 
> ~Ryan
> 
> -- 
> Bluewater Systems Ltd - ARM Technology Solution Centre
> 
> Ryan Mallon         		5 Amuri Park, 404 Barbadoes St
> ryan@bluewatersys.com         	PO Box 13 889, Christchurch 8013
> http://www.bluewatersys.com	New Zealand
> Phone: +64 3 3779127		Freecall: Australia 1800 148 751
> Fax:   +64 3 3779135			  USA 1800 261 2934
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

WARNING: multiple messages have this Message-ID (diff)
From: Julia Lawall <julia@diku.dk>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 2/4] arch/arm/mach-at91/clock.c: Add missing IS_ERR test
Date: Mon, 24 Jan 2011 20:00:59 +0000	[thread overview]
Message-ID: <Pine.LNX.4.64.1101242058430.3167@ask.diku.dk> (raw)
In-Reply-To: <4D3DD964.9020107@bluewatersys.com>

On Tue, 25 Jan 2011, Ryan Mallon wrote:

> On 01/25/2011 08:55 AM, Julia Lawall wrote:
> > Function clk_get, defined just below this code, returns ERR_PTR not NULL in
> > an error case.
> > 
> > The semantic match that finds this problem is as follows:
> > (http://coccinelle.lip6.fr/)
> > 
> > // <smpl>
> > @r@
> > identifier f;
> > @@
> > f(...) { ... return ERR_PTR(...); }
> > 
> > @@
> > identifier r.f, fld;
> > expression x;
> > statement S1,S2;
> > @@
> >  x = f(...)
> >  ... when != IS_ERR(x)
> > (
> >  if (IS_ERR(x) ||...) S1 else S2
> > |
> > *x->fld
> > )
> > // </smpl>
> 
> I'm always really impressed by this tool :-).
> 
> > 
> > Signed-off-by: Julia Lawall <julia@diku.dk>
> > 
> > ---
> >  arch/arm/mach-at91/clock.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> > index 9113da6..c9ee6d0 100644
> > --- a/arch/arm/mach-at91/clock.c
> > +++ b/arch/arm/mach-at91/clock.c
> > @@ -224,7 +224,7 @@ void __init at91_clock_associate(const char *id, struct device *dev, const char
> >  {
> >  	struct clk *clk = clk_get(NULL, id);
> >  
> > -	if (!dev || !clk || !IS_ERR(clk_get(dev, func)))
> > +	if (!dev || IS_ERR(clk) || !IS_ERR(clk_get(dev, func)))
> >  		return;
> 
> I think we want:
> 
> 	if (!dev || !clk || IS_ERR(clk) || !IS_ERR(clk_get(dev, func)))
> 		return;
> 
> Since it is valid to return a NULL clk, and we don't want to try and
> dereference it if that is the case.

Looking at the given defintion of clk_get, I can't see how that could 
happen:

struct clk *clk_get(struct device *dev, const char *id)
{
        struct clk *clk;

        list_for_each_entry(clk, &clocks, node) {
                if (strcmp(id, clk->name) = 0)
                        return clk;
                if (clk->function && (dev = clk->dev) && strcmp(id, clk->function) = 0)
                        return clk;
        }

        return ERR_PTR(-ENOENT);
}

Both paths to the non-ERR_PTR return dereference clk.

julia

> We could also probably drop the !IS_ERR(clk_get(dev, func)) check, since
> as far as I can tell it is just checking to see if the clock is already
> associated, but there is no harm in re-assigning the same values, and
> the two assignments in at91_clock_associate are going to be much quicker
> than the lookup in clk_get.
> 
> ~Ryan
> 
> -- 
> Bluewater Systems Ltd - ARM Technology Solution Centre
> 
> Ryan Mallon         		5 Amuri Park, 404 Barbadoes St
> ryan@bluewatersys.com         	PO Box 13 889, Christchurch 8013
> http://www.bluewatersys.com	New Zealand
> Phone: +64 3 3779127		Freecall: Australia 1800 148 751
> Fax:   +64 3 3779135			  USA 1800 261 2934
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

WARNING: multiple messages have this Message-ID (diff)
From: julia@diku.dk (Julia Lawall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] arch/arm/mach-at91/clock.c: Add missing IS_ERR test
Date: Mon, 24 Jan 2011 21:00:59 +0100 (CET)	[thread overview]
Message-ID: <Pine.LNX.4.64.1101242058430.3167@ask.diku.dk> (raw)
In-Reply-To: <4D3DD964.9020107@bluewatersys.com>

On Tue, 25 Jan 2011, Ryan Mallon wrote:

> On 01/25/2011 08:55 AM, Julia Lawall wrote:
> > Function clk_get, defined just below this code, returns ERR_PTR not NULL in
> > an error case.
> > 
> > The semantic match that finds this problem is as follows:
> > (http://coccinelle.lip6.fr/)
> > 
> > // <smpl>
> > @r@
> > identifier f;
> > @@
> > f(...) { ... return ERR_PTR(...); }
> > 
> > @@
> > identifier r.f, fld;
> > expression x;
> > statement S1,S2;
> > @@
> >  x = f(...)
> >  ... when != IS_ERR(x)
> > (
> >  if (IS_ERR(x) ||...) S1 else S2
> > |
> > *x->fld
> > )
> > // </smpl>
> 
> I'm always really impressed by this tool :-).
> 
> > 
> > Signed-off-by: Julia Lawall <julia@diku.dk>
> > 
> > ---
> >  arch/arm/mach-at91/clock.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> > index 9113da6..c9ee6d0 100644
> > --- a/arch/arm/mach-at91/clock.c
> > +++ b/arch/arm/mach-at91/clock.c
> > @@ -224,7 +224,7 @@ void __init at91_clock_associate(const char *id, struct device *dev, const char
> >  {
> >  	struct clk *clk = clk_get(NULL, id);
> >  
> > -	if (!dev || !clk || !IS_ERR(clk_get(dev, func)))
> > +	if (!dev || IS_ERR(clk) || !IS_ERR(clk_get(dev, func)))
> >  		return;
> 
> I think we want:
> 
> 	if (!dev || !clk || IS_ERR(clk) || !IS_ERR(clk_get(dev, func)))
> 		return;
> 
> Since it is valid to return a NULL clk, and we don't want to try and
> dereference it if that is the case.

Looking at the given defintion of clk_get, I can't see how that could 
happen:

struct clk *clk_get(struct device *dev, const char *id)
{
        struct clk *clk;

        list_for_each_entry(clk, &clocks, node) {
                if (strcmp(id, clk->name) == 0)
                        return clk;
                if (clk->function && (dev == clk->dev) && strcmp(id, clk->function) == 0)
                        return clk;
        }

        return ERR_PTR(-ENOENT);
}

Both paths to the non-ERR_PTR return dereference clk.

julia

> We could also probably drop the !IS_ERR(clk_get(dev, func)) check, since
> as far as I can tell it is just checking to see if the clock is already
> associated, but there is no harm in re-assigning the same values, and
> the two assignments in at91_clock_associate are going to be much quicker
> than the lookup in clk_get.
> 
> ~Ryan
> 
> -- 
> Bluewater Systems Ltd - ARM Technology Solution Centre
> 
> Ryan Mallon         		5 Amuri Park, 404 Barbadoes St
> ryan at bluewatersys.com         	PO Box 13 889, Christchurch 8013
> http://www.bluewatersys.com	New Zealand
> Phone: +64 3 3779127		Freecall: Australia 1800 148 751
> Fax:   +64 3 3779135			  USA 1800 261 2934
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

  reply	other threads:[~2011-01-24 20:01 UTC|newest]

Thread overview: 90+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-24 19:55 [PATCH 0/4] Add missing IS_ERR test Julia Lawall
2011-01-24 19:55 ` Julia Lawall
2011-01-24 19:55 ` [PATCH 1/4] fs/btrfs/inode.c: " Julia Lawall
2011-01-24 19:55   ` Julia Lawall
2011-01-24 19:55 ` [PATCH 2/4] arch/arm/mach-at91/clock.c: " Julia Lawall
2011-01-24 19:55   ` Julia Lawall
2011-01-24 19:55   ` Julia Lawall
2011-01-24 19:56   ` Ryan Mallon
2011-01-24 19:56     ` Ryan Mallon
2011-01-24 19:56     ` Ryan Mallon
2011-01-24 20:00     ` Julia Lawall [this message]
2011-01-24 20:00       ` Julia Lawall
2011-01-24 20:00       ` Julia Lawall
2011-01-24 20:05       ` Vasiliy Kulikov
2011-01-24 20:05         ` Vasiliy Kulikov
2011-01-24 20:05         ` Vasiliy Kulikov
2011-01-24 20:09         ` Julia Lawall
2011-01-24 20:09           ` Julia Lawall
2011-01-24 20:09           ` Julia Lawall
2011-01-24 20:14           ` Vasiliy Kulikov
2011-01-24 20:14             ` Vasiliy Kulikov
2011-01-24 20:14             ` Vasiliy Kulikov
2011-01-25 10:33           ` walter harms
2011-01-25 10:33             ` walter harms
2011-01-25 10:33             ` walter harms
2011-01-25 10:43             ` Russell King - ARM Linux
2011-01-25 10:43               ` Russell King - ARM Linux
2011-01-25 10:43               ` Russell King - ARM Linux
2011-01-25 11:12               ` walter harms
2011-01-25 11:12                 ` walter harms
2011-01-25 11:12                 ` walter harms
2011-01-25 11:17                 ` Russell King - ARM Linux
2011-01-25 11:17                   ` Russell King - ARM Linux
2011-01-25 11:17                   ` Russell King - ARM Linux
2011-01-25 11:18                 ` Julia Lawall
2011-01-25 11:18                   ` Julia Lawall
2011-01-25 11:18                   ` Julia Lawall
2011-01-25 11:26                   ` Russell King - ARM Linux
2011-01-25 11:26                     ` Russell King - ARM Linux
2011-01-25 11:26                     ` Russell King - ARM Linux
2011-01-25 11:31                     ` Julia Lawall
2011-01-25 11:31                       ` Julia Lawall
2011-01-25 11:31                       ` Julia Lawall
2011-01-24 20:11         ` Ryan Mallon
2011-01-24 20:11           ` Ryan Mallon
2011-01-24 20:11           ` Ryan Mallon
2011-01-24 20:28           ` Julia Lawall
2011-01-24 20:28             ` Julia Lawall
2011-01-24 20:28             ` Julia Lawall
2011-01-24 20:38             ` Ryan Mallon
2011-01-24 20:38               ` Ryan Mallon
2011-01-24 20:38               ` Ryan Mallon
2011-01-24 21:01               ` Julia Lawall
2011-01-24 21:01                 ` Julia Lawall
2011-01-24 21:01                 ` Julia Lawall
2011-01-24 21:06                 ` Ryan Mallon
2011-01-24 21:06                   ` Ryan Mallon
2011-01-24 21:06                   ` Ryan Mallon
2011-01-24 21:31                   ` Julia Lawall
2011-01-24 21:31                     ` Julia Lawall
2011-01-24 21:31                     ` Julia Lawall
2011-01-24 21:51                     ` Ryan Mallon
2011-01-24 21:51                       ` Ryan Mallon
2011-01-24 21:51                       ` Ryan Mallon
2011-01-24 23:23                       ` Russell King - ARM Linux
2011-01-24 23:23                         ` Russell King - ARM Linux
2011-01-24 23:23                         ` Russell King - ARM Linux
2011-01-25  1:44                         ` Jean-Christophe PLAGNIOL-VILLARD
2011-01-25  1:44                           ` Jean-Christophe PLAGNIOL-VILLARD
2011-01-25  1:44                           ` Jean-Christophe PLAGNIOL-VILLARD
2011-01-25  6:12                           ` Julia Lawall
2011-01-25  6:12                             ` Julia Lawall
2011-01-25  6:12                             ` Julia Lawall
2011-01-25 17:23                             ` Jean-Christophe PLAGNIOL-VILLARD
2011-01-25 17:23                               ` Jean-Christophe PLAGNIOL-VILLARD
2011-01-25 17:23                               ` Jean-Christophe PLAGNIOL-VILLARD
2011-01-24 19:55 ` [PATCH 3/4] drivers/video/bf537-lq035.c: " Julia Lawall
2011-01-24 19:55   ` Julia Lawall
2011-01-24 20:43   ` Mike Frysinger
2011-01-24 20:43     ` Mike Frysinger
2011-01-25  6:12     ` Paul Mundt
2011-01-25  6:12       ` Paul Mundt
2011-01-25  8:36   ` Hennerich, Michael
2011-01-25  8:36     ` Hennerich, Michael
2011-01-24 19:55 ` [PATCH 4/4] arch/arm/mach-omap2/smartreflex.c: " Julia Lawall
2011-01-24 19:55   ` Julia Lawall
2011-01-24 19:55   ` Julia Lawall
2011-01-24 21:24   ` Kevin Hilman
2011-01-24 21:24     ` Kevin Hilman
2011-01-24 21:24     ` Kevin Hilman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.1101242058430.3167@ask.diku.dk \
    --to=julia@diku.dk \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=linux@maxim.org.za \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    --cc=ryan@bluewatersys.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.