Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3806b45b authored Dec 12, 2013 by Dan Carpenter Committed by Jean Delvare Dec 12, 2013

hwmon: Prevent some divide by zeros in FAN_TO_REG()



The "rpm * div" operations can overflow here, so this patch adds an
upper limit to rpm to prevent that.  Jean Delvare helped me with this
patch.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Roger Lucas <vt8231@hiddenengine.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Jean Delvare <khali@linux-fr.org>

parent 33a7ab91

drivers/hwmon/lm78.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,8 @@ static inline u8 FAN_TO_REG(long rpm, int div)
		{
		if (rpm <= 0)
		return 255;
		if (rpm > 1350000)
		return 1;
		return clamp_val((1350000 + rpm * div / 2) / (rpm * div), 1, 254);
		}

drivers/hwmon/sis5595.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,8 @@ static inline u8 FAN_TO_REG(long rpm, int div)
		{
		if (rpm <= 0)
		return 255;
		if (rpm > 1350000)
		return 1;
		return clamp_val((1350000 + rpm * div / 2) / (rpm * div), 1, 254);
		}

drivers/hwmon/vt8231.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ static const u8 regtempmin[] = { 0x3a, 0x3e, 0x2c, 0x2e, 0x30, 0x32 };
		*/
		static inline u8 FAN_TO_REG(long rpm, int div)
		{
		if (rpm == 0)
		if (rpm <= 0 \|\| rpm > 1310720)
		return 0;
		return clamp_val(1310720 / (rpm * div), 1, 255);
		}