summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVincent BENAYOUN <vincent.benayoun@trust-in-soft.com>2014-11-13 13:47:26 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-06 15:55:33 -0800
commit548da392f3f0b21dcf27e4d284747736bfcfbcba (patch)
tree27db27708fe12e234adfadf0436009670c4b9c68 /include
parentb2007dba1aff3d8bf3d64a52057b17b06afd43f2 (diff)
inetdevice: fixed signed integer overflow
[ 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/inetdevice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 0068708161ff..0a21fbefdfbe 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -242,7 +242,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;
}