Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 791700cd authored by Hugh Dickins's avatar Hugh Dickins Committed by Zhang Rui
Browse files

Thermal: Fix oops and unlocking in thermal_sys.c 



This patch fixes the following mutex and NULL pointer
problems in thermal_sys.c:

 * mutex_unlock fix in update_temperature function
 * mutex_unlock fix in bind_cdev function
 * Correct early return to continue in bind_cdev function
 * NULL check fix in bind_cdev function
 * NULL check fix in bind_tz function

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reported-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
Reported-by: default avatarHugh Dickins <hughd@google.com>
Signed-off-by: default avatarDurgadoss R <durgadoss.r@intel.com>
Signed-off-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent a56757af

drivers/thermal/thermal_sys.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -252,8 +252,8 @@ static void bind_cdev(struct thermal_cooling_device *cdev) 
		}

		}





		tzp = pos->tzp;

		tzp = pos->tzp;

		if (!tzp->tbp)

		if (!tzp || !tzp->tbp)

			return;

			continue;





		for (i = 0; i < tzp->num_tbps; i++) {

		for (i = 0; i < tzp->num_tbps; i++) {

			if (tzp->tbp[i].cdev || !tzp->tbp[i].match)

			if (tzp->tbp[i].cdev || !tzp->tbp[i].match)
@@ -289,7 +289,7 @@ static void bind_tz(struct thermal_zone_device *tz) 
		goto exit;

		goto exit;

	}

	}





	if (!tzp->tbp)

	if (!tzp || !tzp->tbp)

		goto exit;

		goto exit;





	list_for_each_entry(pos, &thermal_cdev_list, node) {

	list_for_each_entry(pos, &thermal_cdev_list, node) {
@@ -387,12 +387,13 @@ static void update_temperature(struct thermal_zone_device *tz) 
	ret = tz->ops->get_temp(tz, &temp);

	ret = tz->ops->get_temp(tz, &temp);

	if (ret) {

	if (ret) {

		pr_warn("failed to read out thermal zone %d\n", tz->id);

		pr_warn("failed to read out thermal zone %d\n", tz->id);

		return;

		goto exit;

	}

	}





	tz->last_temperature = tz->temperature;

	tz->last_temperature = tz->temperature;

	tz->temperature = temp;

	tz->temperature = temp;





exit:

	mutex_unlock(&tz->lock);

	mutex_unlock(&tz->lock);

}

}