]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: mt76: mt7915: fix overflows seen when writing limit attributes
authorxueqin Luo <luoxueqin@kylinos.cn>
Mon, 2 Dec 2024 03:19:17 +0000 (11:19 +0800)
committerFelix Fietkau <nbd@nbd.name>
Tue, 14 Jan 2025 12:34:34 +0000 (13:34 +0100)
DIV_ROUND_CLOSEST() after kstrtoul() results in an overflow if a large
number such as 18446744073709551615 is provided by the user.
Fix it by reordering clamp_val() and DIV_ROUND_CLOSEST() operations.
This commit was inspired by commit: 57ee12b6c514.

Fixes: 02ee68b95d81 ("mt76: mt7915: add control knobs for thermal throttling")
Signed-off-by: xueqin Luo <luoxueqin@kylinos.cn>
Link: https://patch.msgid.link/20241202031917.23741-3-luoxueqin@kylinos.cn
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7915/init.c

index f82216d1bda087e35b565bd570cfd805df03c0b5..bc983ab10b0c7abf324e95808e324bdef78d1335 100644 (file)
@@ -82,7 +82,7 @@ static ssize_t mt7915_thermal_temp_store(struct device *dev,
                return ret;
 
        mutex_lock(&phy->dev->mt76.mutex);
-       val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 60, 130);
+       val = DIV_ROUND_CLOSEST(clamp_val(val, 60 * 1000, 130 * 1000), 1000);
 
        if ((i - 1 == MT7915_CRIT_TEMP_IDX &&
             val > phy->throttle_temp[MT7915_MAX_TEMP_IDX]) ||