Unverified Commit 178114dd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12764 thermal: core: Reference count the zone in thermal_zone_get_by_id() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiongfeng Wang <wangxiongfeng2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MIGO6D5GILFWXJFQHGPMFV3MDMTSAUZY/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRF5 
 
Link:https://gitee.com/openeuler/kernel/pulls/12764

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 03ef650d 0b6654f3

drivers/thermal/thermal_core.c

+1 −0
Original line number Diff line number Diff line
@@ -760,6 +760,7 @@ struct thermal_zone_device *thermal_zone_get_by_id(int id) 
	mutex_lock(&thermal_list_lock);

	list_for_each_entry(tz, &thermal_tz_list, node) {

		if (tz->id == id) {

			get_device(&tz->device);

			match = tz;

			break;

		}

drivers/thermal/thermal_netlink.c

+15 −5
Original line number Diff line number Diff line
@@ -463,8 +463,10 @@ static int thermal_genl_cmd_tz_get_trip(struct param *p) 
		return -EINVAL;



	start_trip = nla_nest_start(msg, THERMAL_GENL_ATTR_TZ_TRIP);

	if (!start_trip)

	if (!start_trip) {

		put_device(&tz->device);

		return -EMSGSIZE;

	}



	mutex_lock(&tz->lock);
@@ -489,10 +491,13 @@ static int thermal_genl_cmd_tz_get_trip(struct param *p) 


	nla_nest_end(msg, start_trip);



	put_device(&tz->device);



	return 0;



out_cancel_nest:

	mutex_unlock(&tz->lock);

	put_device(&tz->device);



	return -EMSGSIZE;

}
@@ -514,13 +519,17 @@ static int thermal_genl_cmd_tz_get_temp(struct param *p) 


	ret = thermal_zone_get_temp(tz, &temp);

	if (ret)

		return ret;

		goto out;



	if (nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_ID, id) ||

	    nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_TEMP, temp))

		return -EMSGSIZE;

	    nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_TEMP, temp)) {

		ret = -EMSGSIZE;

		goto out;

	}



	return 0;

out:

	put_device(&tz->device);

	return ret;

}



static int thermal_genl_cmd_tz_get_gov(struct param *p)
@@ -546,6 +555,7 @@ static int thermal_genl_cmd_tz_get_gov(struct param *p) 
		ret = -EMSGSIZE;



	mutex_unlock(&tz->lock);

	put_device(&tz->device);



	return ret;

}