]> git.hungrycats.org Git - linux/commitdiff
inetdevice: fixed signed integer overflow
authorVincent BENAYOUN <vincent.benayoun@trust-in-soft.com>
Thu, 13 Nov 2014 12:47:26 +0000 (13:47 +0100)
committerJiri Slaby <jslaby@suse.cz>
Thu, 27 Nov 2014 10:14:05 +0000 (11:14 +0100)
[ Upstream commit 84bc88688e3f6ef843aa8803dbcd90168bb89faf ]

There could be a signed overflow in the following code.

The expression, (32-logmask) is comprised between 0 and 31 included.
It may be equal to 31.
In such a case the left shift will produce a signed integer overflow.
According to the C99 Standard, this is an undefined behavior.
A simple fix is to replace the signed int 1 with the unsigned int 1U.

Signed-off-by: Vincent BENAYOUN <vincent.benayoun@trust-in-soft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
include/linux/inetdevice.h

index 79640e015a86c6eb4a8bab2c0d2ee78eaf241558..f738f922542ddefb50f2123c013a1c9ac20d0f1a 100644 (file)
@@ -234,7 +234,7 @@ static inline void in_dev_put(struct in_device *idev)
 static __inline__ __be32 inet_make_mask(int logmask)
 {
        if (logmask)
-               return htonl(~((1<<(32-logmask))-1));
+               return htonl(~((1U<<(32-logmask))-1));
        return 0;
 }