2008-02-20 00:16:31

by Adrian Bunk

Subject: [2.6 patch] drivers/thermal/thermal.c: fix a check-after-use

This patch fixes a check-after-use spotted by the Coverity checker.

Signed-off-by: Adrian Bunk <[email protected]>

---
570462ca4441d8d63dfd46efe6e5b2b1c251a611 diff --git a/drivers/thermal/thermal.c b/drivers/thermal/thermal.c
index e782b3e..958654b 100644
--- a/drivers/thermal/thermal.c
+++ b/drivers/thermal/thermal.c
@@ -308,10 +308,10 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
struct thermal_cooling_device_instance *pos;
int result;

- if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
+ if (!tz || !cdev)
return -EINVAL;

- if (!tz || !cdev)
+ if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
return -EINVAL;

dev =

2008-02-20 00:25:07

by Harvey Harrison

Subject: Re: [2.6 patch] drivers/thermal/thermal.c: fix a check-after-use

On Wed, 2008-02-20 at 02:14 +0200, Adrian Bunk wrote:
> This patch fixes a check-after-use spotted by the Coverity checker.
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
> 570462ca4441d8d63dfd46efe6e5b2b1c251a611 diff --git a/drivers/thermal/thermal.c b/drivers/thermal/thermal.c
> index e782b3e..958654b 100644
> --- a/drivers/thermal/thermal.c
> +++ b/drivers/thermal/thermal.c
> @@ -308,10 +308,10 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
> struct thermal_cooling_device_instance *pos;
> int result;
>
> - if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
> + if (!tz || !cdev)
> return -EINVAL;
>
> - if (!tz || !cdev)
> + if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
> return -EINVAL;
>

How about:
if (!tz || !cdev || trip >= tz->trips ||
(trip < 0 && trip != THERMAL_TRIPS_NONE))
return -EINVAL;

Cheers,

Harvey

2008-02-20 00:27:07

by Adrian Bunk

Subject: Re: [2.6 patch] drivers/thermal/thermal.c: fix a check-after-use

On Tue, Feb 19, 2008 at 04:25:02PM -0800, Harvey Harrison wrote:
> On Wed, 2008-02-20 at 02:14 +0200, Adrian Bunk wrote:
> > This patch fixes a check-after-use spotted by the Coverity checker.
> >
> > Signed-off-by: Adrian Bunk <[email protected]>
> >
> > ---
> > 570462ca4441d8d63dfd46efe6e5b2b1c251a611 diff --git a/drivers/thermal/thermal.c b/drivers/thermal/thermal.c
> > index e782b3e..958654b 100644
> > --- a/drivers/thermal/thermal.c
> > +++ b/drivers/thermal/thermal.c
> > @@ -308,10 +308,10 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
> > struct thermal_cooling_device_instance *pos;
> > int result;
> >
> > - if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
> > + if (!tz || !cdev)
> > return -EINVAL;
> >
> > - if (!tz || !cdev)
> > + if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
> > return -EINVAL;
> >
>
> How about:
> if (!tz || !cdev || trip >= tz->trips ||
> (trip < 0 && trip != THERMAL_TRIPS_NONE))
> return -EINVAL;

I have no strong opinion about it, but I'd consider your suggestion less
readable.

> Cheers,
>
> Harvey

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

2008-02-23 07:20:17

by Len Brown

Subject: Re: [2.6 patch] drivers/thermal/thermal.c: fix a check-after-use

On Tuesday 19 February 2008 19:14, Adrian Bunk wrote:
> This patch fixes a check-after-use spotted by the Coverity checker.
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
> 570462ca4441d8d63dfd46efe6e5b2b1c251a611 diff --git a/drivers/thermal/thermal.c b/drivers/thermal/thermal.c
> index e782b3e..958654b 100644
> --- a/drivers/thermal/thermal.c
> +++ b/drivers/thermal/thermal.c
> @@ -308,10 +308,10 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
> struct thermal_cooling_device_instance *pos;
> int result;
>
> - if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
> + if (!tz || !cdev)
> return -EINVAL;
>
> - if (!tz || !cdev)
> + if (trip >= tz->trips || (trip < 0 && trip != THERMAL_TRIPS_NONE))
> return -EINVAL;
>
> dev =
>
> --

this patch no longer applies because the bogus check for a programming error
was already replaced by a better check of run-time params.

thanks,
-len