[PATCH v2] ipv6: Avoid unnecessary temporary addresses being generated

[PATCH v2] ipv6: Avoid unnecessary temporary addresses being generated

[Heiner Kallweit]

tmp_prefered_lft is an offset to ifp->tstamp, not now. Therefore
age needs to be added to the condition.

Age calculation in ipv6_create_tempaddr is different from the one
in addrconf_verify and doesn't consider ADDRCONF_TIMER_FUZZ_MINUS.
This can cause age in ipv6_create_tempaddr to be less than the one
in addrconf_verify and therefore unnecessary temporary address to
be generated.
Use age calculation as in addrconf_modify to avoid this.

Signed-off-by: Heiner Kallweit <heiner.kallweit@web.de>
---
 net/ipv6/addrconf.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index fdbfeca..bd64dbe 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1103,8 +1103,11 @@ retry:
 	 * Lifetime is greater than REGEN_ADVANCE time units.  In particular,
 	 * an implementation must not create a temporary address with a zero
 	 * Preferred Lifetime.
+	 * Use age calculation as in addrconf_verify to avoid unnecessary
+	 * temporary addresses being generated.
 	 */
-	if (tmp_prefered_lft <= regen_advance) {
+	age = (now - tmp_tstamp + ADDRCONF_TIMER_FUZZ_MINUS) / HZ;
+	if (tmp_prefered_lft <= regen_advance + age) {
 		in6_ifa_put(ifp);
 		in6_dev_put(idev);
 		ret = -1;
-- 
1.7.10.4

Re: [PATCH v2] ipv6: Avoid unnecessary temporary addresses being generated

[David Miller]

From: Heiner Kallweit <heiner.kallweit@web.de>
Date: Wed, 12 Mar 2014 22:13:19 +0100

> tmp_prefered_lft is an offset to ifp->tstamp, not now. Therefore
> age needs to be added to the condition.
> 
> Age calculation in ipv6_create_tempaddr is different from the one
> in addrconf_verify and doesn't consider ADDRCONF_TIMER_FUZZ_MINUS.
> This can cause age in ipv6_create_tempaddr to be less than the one
> in addrconf_verify and therefore unnecessary temporary address to
> be generated.
> Use age calculation as in addrconf_modify to avoid this.
> 
> Signed-off-by: Heiner Kallweit <heiner.kallweit@web.de>

Looks good, applied, thank you.