2024-01-12 14:30:34

by Dan Carpenter

Subject: [PATCH] thermal/debugfs: Unlock on error path in thermal_debug_tz_trip_up()

Add a missing mutex_unlock(&thermal_dbg->lock) to this error path.

Fixes: 4731c8f16a0e ("thermal/debugfs: Add thermal debugfs information for mitigation episodes")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/thermal/thermal_debugfs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/thermal_debugfs.c b/drivers/thermal/thermal_debugfs.c
index a3fa09235da1..a3f06029fc54 100644
--- a/drivers/thermal/thermal_debugfs.c
+++ b/drivers/thermal/thermal_debugfs.c
@@ -591,7 +591,7 @@ void thermal_debug_tz_trip_up(struct thermal_zone_device *tz,
if (!tz_dbg->nr_trips) {
tze = thermal_debugfs_tz_event_alloc(tz, now);
if (!tze)
- return;
+ goto unlock;

list_add(&tze->node, &tz_dbg->tz_episodes);
}
@@ -619,6 +619,7 @@ void thermal_debug_tz_trip_up(struct thermal_zone_device *tz,
(temperature - tze->trip_stats[trip_id].avg) /
tze->trip_stats[trip_id].count;

+unlock:
mutex_unlock(&thermal_dbg->lock);
}

--
2.43.0

2024-01-12 14:56:58

by Rafael J. Wysocki

Subject: Re: [PATCH] thermal/debugfs: Unlock on error path in thermal_debug_tz_trip_up()

On Fri, Jan 12, 2024 at 3:30 PM Dan Carpenter <dan.carpenter@linaroorg> wrote:
>
> Add a missing mutex_unlock(&thermal_dbg->lock) to this error path.
>
> Fixes: 4731c8f16a0e ("thermal/debugfs: Add thermal debugfs information for mitigation episodes")
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> drivers/thermal/thermal_debugfs.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/thermal_debugfs.c b/drivers/thermal/thermal_debugfs.c
> index a3fa09235da1..a3f06029fc54 100644
> --- a/drivers/thermal/thermal_debugfs.c
> +++ b/drivers/thermal/thermal_debugfs.c
> @@ -591,7 +591,7 @@ void thermal_debug_tz_trip_up(struct thermal_zone_device *tz,
> if (!tz_dbg->nr_trips) {
> tze = thermal_debugfs_tz_event_alloc(tz, now);
> if (!tze)
> - return;
> + goto unlock;
>
> list_add(&tze->node, &tz_dbg->tz_episodes);
> }
> @@ -619,6 +619,7 @@ void thermal_debug_tz_trip_up(struct thermal_zone_device *tz,
> (temperature - tze->trip_stats[trip_id].avg) /
> tze->trip_stats[trip_id].count;
>
> +unlock:
> mutex_unlock(&thermal_dbg->lock);
> }
>
> --

Applied, thanks!