IPv6: Temp addresses are immediately deleted.
There is a bug in the interaction between ipv6_create_tempaddr and addrconf_verify. Because ipv6_create_tempaddr uses the cstamp and tstamp from the public address in creating a private address, if we have not received a router advertisement in a while, tstamp + temp_valid_lft might be < now. If this happens, the new address is created inside ipv6_create_tempaddr, then the loop within addrconf_verify starts again and the address is immediately deleted. We are left with no temporary addresses on the interface, and no more will be created until the public IP address is updated. To avoid this, set the expiry time to be the minimum of the time left on the public address or the config option PLUS the current age of the public interface. Signed-off-by: Glenn Wurster <gwurster@scs.carleton.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
aed65501e8
commit
7a876b0efc
|
@ -836,7 +836,7 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, struct inet6_ifaddr *i
|
||||||
{
|
{
|
||||||
struct inet6_dev *idev = ifp->idev;
|
struct inet6_dev *idev = ifp->idev;
|
||||||
struct in6_addr addr, *tmpaddr;
|
struct in6_addr addr, *tmpaddr;
|
||||||
unsigned long tmp_prefered_lft, tmp_valid_lft, tmp_cstamp, tmp_tstamp;
|
unsigned long tmp_prefered_lft, tmp_valid_lft, tmp_cstamp, tmp_tstamp, age;
|
||||||
unsigned long regen_advance;
|
unsigned long regen_advance;
|
||||||
int tmp_plen;
|
int tmp_plen;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
@ -886,12 +886,13 @@ retry:
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
memcpy(&addr.s6_addr[8], idev->rndid, 8);
|
memcpy(&addr.s6_addr[8], idev->rndid, 8);
|
||||||
|
age = (jiffies - ifp->tstamp) / HZ;
|
||||||
tmp_valid_lft = min_t(__u32,
|
tmp_valid_lft = min_t(__u32,
|
||||||
ifp->valid_lft,
|
ifp->valid_lft,
|
||||||
idev->cnf.temp_valid_lft);
|
idev->cnf.temp_valid_lft + age);
|
||||||
tmp_prefered_lft = min_t(__u32,
|
tmp_prefered_lft = min_t(__u32,
|
||||||
ifp->prefered_lft,
|
ifp->prefered_lft,
|
||||||
idev->cnf.temp_prefered_lft -
|
idev->cnf.temp_prefered_lft + age -
|
||||||
idev->cnf.max_desync_factor);
|
idev->cnf.max_desync_factor);
|
||||||
tmp_plen = ifp->prefix_len;
|
tmp_plen = ifp->prefix_len;
|
||||||
max_addresses = idev->cnf.max_addresses;
|
max_addresses = idev->cnf.max_addresses;
|
||||||
|
|
Loading…
Reference in New Issue