IPv6: fix address-lifetime overflows on 64-bit architectures
authorSteven Barth <steven@midlink.org>
Tue, 28 May 2013 18:47:33 +0000 (20:47 +0200)
committerSteven Barth <steven@midlink.org>
Tue, 28 May 2013 18:47:33 +0000 (20:47 +0200)
system-linux.c

index f5c900db2185ff5b6e17cc5228bc3f04208f92aa..c6d81e60459f08165cd05ebfdec35d0250be68b3 100644 (file)
@@ -918,17 +918,21 @@ static int system_addr(struct device *dev, struct device_addr *addr, int cmd)
                struct ifa_cacheinfo cinfo = {0xffffffffU, 0xffffffffU, 0, 0};
 
                if (addr->preferred_until) {
-                       int preferred = addr->preferred_until - now;
+                       int64_t preferred = addr->preferred_until - now;
                        if (preferred < 0)
                                preferred = 0;
+                       else if (preferred > UINT32_MAX)
+                               preferred = UINT32_MAX;
 
                        cinfo.ifa_prefered = preferred;
                }
 
                if (addr->valid_until) {
-                       int valid = addr->valid_until - now;
+                       int64_t valid = addr->valid_until - now;
                        if (valid <= 0)
                                return -1;
+                       else if (valid > UINT32_MAX)
+                               valid = UINT32_MAX;
 
                        cinfo.ifa_valid = valid;
                }