Unverified Commit 512534f2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14342 hwmon: (nct6775-core) Fix overflows seen when writing limit attributes 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Huafei <lihuafei1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZBQKLT4MYW37NAFXPHV5YTNV3DZQBEWC/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBDHGY 
 
Link:https://gitee.com/openeuler/kernel/pulls/14342

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 6bbb4707 17828f12

drivers/hwmon/nct6775-core.c

+3 −4
Original line number Diff line number Diff line
@@ -2878,8 +2878,7 @@ store_target_temp(struct device *dev, struct device_attribute *attr, 
	if (err < 0)

		return err;



	val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0,

			data->target_temp_mask);

	val = DIV_ROUND_CLOSEST(clamp_val(val, 0, data->target_temp_mask * 1000), 1000);



	mutex_lock(&data->update_lock);

	data->target_temp[nr] = val;
@@ -2959,7 +2958,7 @@ store_temp_tolerance(struct device *dev, struct device_attribute *attr, 
		return err;



	/* Limit tolerance as needed */

	val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, data->tolerance_mask);

	val = DIV_ROUND_CLOSEST(clamp_val(val, 0, data->tolerance_mask * 1000), 1000);



	mutex_lock(&data->update_lock);

	data->temp_tolerance[index][nr] = val;
@@ -3085,7 +3084,7 @@ store_weight_temp(struct device *dev, struct device_attribute *attr, 
	if (err < 0)

		return err;



	val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, 255);

	val = DIV_ROUND_CLOSEST(clamp_val(val, 0, 255000), 1000);



	mutex_lock(&data->update_lock);

	data->weight_temp[index][nr] = val;