Mercurial > hg > dhcpcd
changeset 3101:c0d82d35f83d draft
Fix IPv6 prefix underflow when confirming deprecated but valid leases.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Wed, 06 May 2015 15:21:56 +0000 |
| parents | 132cdf2fe88d |
| children | a7a7440073dd |
| files | ipv6.c |
| diffstat | 1 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ipv6.c Sat May 02 14:07:59 2015 +0000 +++ b/ipv6.c Wed May 06 15:21:56 2015 +0000 @@ -689,20 +689,32 @@ now = &n; } timespecsub(now, &ap->acquired, &n); - if (ap->prefix_pltime != ND6_INFINITE_LIFETIME) + if (ap->prefix_pltime != ND6_INFINITE_LIFETIME) { ap->prefix_pltime -= (uint32_t)n.tv_sec; + /* This can happen when confirming a + * deprecated but still valid lease. */ + if (ap->prefix_pltime > pltime) + ap->prefix_pltime = 0; + } if (ap->prefix_vltime != ND6_INFINITE_LIFETIME) ap->prefix_vltime -= (uint32_t)n.tv_sec; - } - if (if_addaddress6(ap) == -1) { - logger(ap->iface->ctx, LOG_ERR, "if_addaddress6: %m"); #if 0 logger(ap->iface->ctx, LOG_DEBUG, + "%s: acquired %lld.%.9ld, now %lld.%.9ld, diff %lld.%.9ld", + ap->iface->name, + (long long)ap->acquired.tv_sec, ap->acquired.tv_nsec, + (long long)now->tv_sec, now->tv_nsec, + (long long)n.tv_sec, n.tv_nsec); + logger(ap->iface->ctx, LOG_DEBUG, "%s: adj pltime %"PRIu32" seconds, " "vltime %"PRIu32" seconds", ap->iface->name, ap->prefix_pltime, ap->prefix_vltime); #endif + } + + if (if_addaddress6(ap) == -1) { + logger(ap->iface->ctx, LOG_ERR, "if_addaddress6: %m"); /* Restore real pltime and vltime */ ap->prefix_pltime = pltime; ap->prefix_vltime = vltime;