Skip to contentSkip to conversation

ethtool: avoiding integer overflow in ethtool_phys_id()

PATCH Superseded Maxim Korotkov 2 participants 2 messages Nov 22, 2022

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ethtool: avoiding integer overflow in ethtool_phys_id()

The value of an arithmetic expression "n * id.data" is subject to possible overflow due to a failure to cast operands to a larger data type before performing arithmetic. Used macro for multiplication instead operator for avoiding overflow.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

---
 net/ethtool/ioctl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/ethtool/ioctl.c +2 -1
index 6a7308de192d..f845e8be4d7c 100644
@@ -2007,7 +2007,8 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)
 	} else {
 		/* Driver expects to be called at twice the frequency in rc */
 		int n = rc * 2, interval = HZ / n;
-		u64 count = n * id.data, i = 0;
+		u64 count = mul_u32_u32(n,id.data);
+		u64 i = 0;
 
 		do {
 			rtnl_lock();
Signature · 1 line
2.17.1
Reviewed-by on v2 1/1
#1 lore raw

From: Maxim Korotkov <[email protected]>
Date: Tue, 22 Nov 2022 09:54:23 +0300

Quoted 17 lines

The value of an arithmetic expression "n * id.data" is subject to possible overflow due to a failure to cast operands to a larger data type before performing arithmetic. Used macro for multiplication instead operator for avoiding overflow.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

---
 net/ethtool/ioctl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/ethtool/ioctl.c +0 -0
index 6a7308de192d..f845e8be4d7c 100644

net/ethtool/ioctl.c static int ethtool_phys_id(struct net_device *dev, void __user *useraddr) · line 2010

Quoted 5 lines
net/ethtool/ioctl.c +1 -1
@@ -2007,7 +2007,8 @@ static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)
 	} else {
 		/* Driver expects to be called at twice the frequency in rc */
 		int n = rc * 2, interval = HZ / n;
-		u64 count = n * id.data, i = 0;
+		u64 count = mul_u32_u32(n,id.data);
                                         ^^

Meh, you forgot to put a space after the comma :s

Other than that (please add it to a v3):

Quoted 6 lines
net/ethtool/ioctl.c +1 -0
+		u64 i = 0;
 
 		do {
 			rtnl_lock();
Signature · 1 line
2.17.1

Thanks,
Olek