]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
hwmon: (ltc2991) re-order conditions to fix off by one bug
authorDan Carpenter <dan.carpenter@linaro.org>
Thu, 4 Jul 2024 15:18:59 +0000 (10:18 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Aug 2024 06:59:13 +0000 (08:59 +0200)
[ Upstream commit 99bf7c2eccff82760fa23ce967cc67c8c219c6a6 ]

LTC2991_T_INT_CH_NR is 4.  The st->temp_en[] array has LTC2991_MAX_CHANNEL
(4) elements.  Thus if "channel" is equal to LTC2991_T_INT_CH_NR then we
have read one element beyond the end of the array.  Flip the conditions
around so that we check if "channel" is valid before using it as an array
index.

Fixes: 2b9ea4262ae9 ("hwmon: Add driver for ltc2991")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/Zoa9Y_UMY4_ROfhF@stanley.mountain
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/hwmon/ltc2991.c

index 06750bb93c236795f6db825c82607a7d9abd6f1c..f74ce9c25bf71a05114366a132f3a36e5ec9023a 100644 (file)
@@ -225,8 +225,8 @@ static umode_t ltc2991_is_visible(const void *data,
        case hwmon_temp:
                switch (attr) {
                case hwmon_temp_input:
-                       if (st->temp_en[channel] ||
-                           channel == LTC2991_T_INT_CH_NR)
+                       if (channel == LTC2991_T_INT_CH_NR ||
+                           st->temp_en[channel])
                                return 0444;
                        break;
                }