projects
/
project
/
netifd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eec42f5
)
IPv6: fix address-lifetime overflows on 64-bit architectures
author
Steven Barth
<steven@midlink.org>
Tue, 28 May 2013 18:47:33 +0000
(20:47 +0200)
committer
Steven Barth
<steven@midlink.org>
Tue, 28 May 2013 18:47:33 +0000
(20:47 +0200)
system-linux.c
patch
|
blob
|
history
diff --git
a/system-linux.c
b/system-linux.c
index
f5c900d
..
c6d81e6
100644
(file)
--- a/
system-linux.c
+++ b/
system-linux.c
@@
-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) {
struct ifa_cacheinfo cinfo = {0xffffffffU, 0xffffffffU, 0, 0};
if (addr->preferred_until) {
- int preferred = addr->preferred_until - now;
+ int
64_t
preferred = addr->preferred_until - now;
if (preferred < 0)
preferred = 0;
if (preferred < 0)
preferred = 0;
+ else if (preferred > UINT32_MAX)
+ preferred = UINT32_MAX;
cinfo.ifa_prefered = preferred;
}
if (addr->valid_until) {
cinfo.ifa_prefered = preferred;
}
if (addr->valid_until) {
- int valid = addr->valid_until - now;
+ int
64_t
valid = addr->valid_until - now;
if (valid <= 0)
return -1;
if (valid <= 0)
return -1;
+ else if (valid > UINT32_MAX)
+ valid = UINT32_MAX;
cinfo.ifa_valid = valid;
}
cinfo.ifa_valid = valid;
}