diff options
| author | Steven Barth <steven@midlink.org> | 2013-05-28 19:59:19 +0200 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2013-05-28 19:59:19 +0200 |
| commit | eec42f59364590f2210849a3a48ceb3ee8cbbb1c (patch) | |
| tree | 2e321c8d31c98f760d795dfd262d58859574f0e2 /interface-ip.c | |
| parent | 7963b8875872e7456687042b69f2b5a4a474e441 (diff) | |
| download | netifd-eec42f59364590f2210849a3a48ceb3ee8cbbb1c.tar.gz | |
IPv6: fix wrap-arounds in address lifetimes
Diffstat (limited to 'interface-ip.c')
| -rw-r--r-- | interface-ip.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/interface-ip.c b/interface-ip.c index 2444cda..47747cb 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -17,6 +17,7 @@ #include <stdio.h> #include <unistd.h> +#include <limits.h> #include <arpa/inet.h> #include "netifd.h" @@ -328,8 +329,12 @@ interface_ip_add_route(struct interface *iface, struct blob_attr *attr, bool v6) route->flags |= DEVROUTE_TABLE; } - if ((cur = tb[ROUTE_VALID]) != NULL) - route->valid_until = system_get_rtime() + blobmsg_get_u32(cur); + if ((cur = tb[ROUTE_VALID]) != NULL) { + int64_t valid = blobmsg_get_u32(cur); + int64_t valid_until = valid + (int64_t)system_get_rtime(); + if (valid_until <= LONG_MAX && valid != 0xffffffffLL) // Catch overflow + route->valid_until = valid_until; + } vlist_add(&ip->route, &route->node, route); return; |