Unverified Commit 1ee72fd9 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7892 CVE-2023-52868 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3ZR42ZXMFU5CTGQ3FDBTGMRESIJNWW5G/ 
*** BLURB HERE ***

Dan Carpenter (1):
  thermal: core: prevent potential string overflow


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9RFK5 
 
Link:https://gitee.com/openeuler/kernel/pulls/7892

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 6d5a0be9 e569cd17

drivers/thermal/thermal_core.c

+4 −2
Original line number Diff line number Diff line
@@ -733,7 +733,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, 
	if (result)

		goto release_ida;



	sprintf(dev->attr_name, "cdev%d_trip_point", dev->id);

	snprintf(dev->attr_name, sizeof(dev->attr_name), "cdev%d_trip_point",

		 dev->id);

	sysfs_attr_init(&dev->attr.attr);

	dev->attr.attr.name = dev->attr_name;

	dev->attr.attr.mode = 0444;
@@ -742,7 +743,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, 
	if (result)

		goto remove_symbol_link;



	sprintf(dev->weight_attr_name, "cdev%d_weight", dev->id);

	snprintf(dev->weight_attr_name, sizeof(dev->weight_attr_name),

		 "cdev%d_weight", dev->id);

	sysfs_attr_init(&dev->weight_attr.attr);

	dev->weight_attr.attr.name = dev->weight_attr_name;

	dev->weight_attr.attr.mode = S_IWUSR | S_IRUGO;