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 /proto.c | |
| parent | 7963b8875872e7456687042b69f2b5a4a474e441 (diff) | |
IPv6: fix wrap-arounds in address lifetimes
Diffstat (limited to 'proto.c')
| -rw-r--r-- | proto.c | 25 |
1 files changed, 14 insertions, 11 deletions
@@ -15,6 +15,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <limits.h> #include <arpa/inet.h> #include <netinet/in.h> @@ -187,15 +188,17 @@ parse_address_item(struct blob_attr *attr, bool v6, bool ext) } else { time_t now = system_get_rtime(); if ((cur = tb[ADDR_PREFERRED])) { - uint32_t preferred = blobmsg_get_u32(cur); - if (preferred < UINT32_MAX) - addr->preferred_until = now + preferred; + int64_t preferred = blobmsg_get_u32(cur); + int64_t preferred_until = preferred + (int64_t)now; + if (preferred_until <= LONG_MAX && preferred != 0xffffffffLL) + addr->preferred_until = preferred_until; } if ((cur = tb[ADDR_VALID])) { - uint32_t valid = blobmsg_get_u32(cur); - if (valid < UINT32_MAX) - addr->valid_until = now + valid; + int64_t valid = blobmsg_get_u32(cur); + int64_t valid_until = valid + (int64_t)now; + if (valid_until <= LONG_MAX && valid != 0xffffffffLL) + addr->valid_until = valid_until; } @@ -283,8 +286,8 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len) char *validstr = (!prefstr) ? NULL : strtok_r(NULL, ",", &saveptr); char *addstr = (!validstr) ? NULL : strtok_r(NULL, ",", &saveptr); - uint32_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10); - uint32_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10); + int64_t pref = (!prefstr) ? 0 : strtoul(prefstr, NULL, 10); + int64_t valid = (!validstr) ? 0 : strtoul(validstr, NULL, 10); uint8_t length = strtoul(lengthstr, NULL, 10), excl_length = 0; if (length < 1 || length > 64) @@ -319,13 +322,13 @@ parse_prefix_option(struct interface *iface, const char *str, size_t len) - time_t now = system_get_rtime(); + int64_t now = system_get_rtime(); time_t preferred_until = 0; - if (prefstr && pref != 0xffffffffU) + if (prefstr && pref != 0xffffffffLL && pref + now <= LONG_MAX) preferred_until = pref + now; time_t valid_until = 0; - if (validstr && valid != 0xffffffffU) + if (validstr && valid != 0xffffffffLL && valid + now <= LONG_MAX) valid_until = valid + now; interface_ip_add_device_prefix(iface, &addr, length, |