diff mbox series

thermal: Fix zone lookup by ID

Message ID 20200724170105.2705467-1-thierry.reding@gmail.com (mailing list archive)
State New, archived
Delegated to: Daniel Lezcano
Headers show
Series thermal: Fix zone lookup by ID | expand

Commit Message

Thierry Reding July 24, 2020, 5:01 p.m. UTC 
From: Thierry Reding <treding@nvidia.com>

When a thermal zone is looked up by an ID and no zone is found matching
that ID, the thermal_zone_get_by_id() function will return a pointer to
the thermal zone list head which isn't actually a valid thermal zone.

This can lead to a subsequent crash because a valid pointer is returned
to the called, but dereferencing that pointer as struct thermal_zone is
not safe.

Fixes: 329b064fbd13 ("thermal: core: Get thermal zone by id")
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/thermal/thermal_core.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Daniel Lezcano July 24, 2020, 5:12 p.m. UTC | #1 
Hi Thierry,

Applied, thanks for the fix!


On 24/07/2020 19:01, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> When a thermal zone is looked up by an ID and no zone is found matching
> that ID, the thermal_zone_get_by_id() function will return a pointer to
> the thermal zone list head which isn't actually a valid thermal zone.
> 
> This can lead to a subsequent crash because a valid pointer is returned
> to the called, but dereferencing that pointer as struct thermal_zone is
> not safe.
> 
> Fixes: 329b064fbd13 ("thermal: core: Get thermal zone by id")
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
>  drivers/thermal/thermal_core.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index 007f9618e20a..9748fbb9a3a1 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -751,16 +751,18 @@ int for_each_thermal_zone(int (*cb)(struct thermal_zone_device *, void *),
>  
>  struct thermal_zone_device *thermal_zone_get_by_id(int id)
>  {
> -	struct thermal_zone_device *tz = NULL;
> +	struct thermal_zone_device *tz, *match = NULL;
>  
>  	mutex_lock(&thermal_list_lock);
>  	list_for_each_entry(tz, &thermal_tz_list, node) {
> -		if (tz->id == id)
> +		if (tz->id == id) {
> +			match = tz;
>  			break;
> +		}
>  	}
>  	mutex_unlock(&thermal_list_lock);
>  
> -	return tz;
> +	return match;
>  }
>  
>  void thermal_zone_device_unbind_exception(struct thermal_zone_device *tz,
>
Thierry Reding July 27, 2020, 9:01 a.m. UTC | #2 
On Fri, Jul 24, 2020 at 07:12:49PM +0200, Daniel Lezcano wrote:
> Hi Thierry,
> 
> Applied, thanks for the fix!

I ran into this as I was experimenting with the new netlink interface
and got things wrong. Do you have any userspace that you use for testing
this that I can use as a reference?

I have managed to get it to work now, but I'm still interested in any
userspace that you might have for this.

Thierry
Daniel Lezcano July 27, 2020, 9:04 a.m. UTC | #3 
Hi Thierry,

thanks for testing the code.

On 27/07/2020 11:01, Thierry Reding wrote:
> On Fri, Jul 24, 2020 at 07:12:49PM +0200, Daniel Lezcano wrote:
>> Hi Thierry,
>>
>> Applied, thanks for the fix!
> 
> I ran into this as I was experimenting with the new netlink interface
> and got things wrong. Do you have any userspace that you use for testing
> this that I can use as a reference?
> 
> I have managed to get it to work now, but I'm still interested in any
> userspace that you might have for this.


  https://git.linaro.org/people/daniel.lezcano/thermal-genl.git/
diff mbox series

Patch

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 007f9618e20a..9748fbb9a3a1 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -751,16 +751,18 @@  int for_each_thermal_zone(int (*cb)(struct thermal_zone_device *, void *),
 
 struct thermal_zone_device *thermal_zone_get_by_id(int id)
 {
-	struct thermal_zone_device *tz = NULL;
+	struct thermal_zone_device *tz, *match = NULL;
 
 	mutex_lock(&thermal_list_lock);
 	list_for_each_entry(tz, &thermal_tz_list, node) {
-		if (tz->id == id)
+		if (tz->id == id) {
+			match = tz;
 			break;
+		}
 	}
 	mutex_unlock(&thermal_list_lock);
 
-	return tz;
+	return match;
 }
 
 void thermal_zone_device_unbind_exception(struct thermal_zone_device *tz,