Bug 71591 - Temporary address re-generated when it should not (public address about to expire)

Recently I faced the issue that a public address was about to expire and 3s before expiry a new temporary address was generated which instantly went into deprecated state. This didn't do any harm however it's wrong IMHO. Problem seems to be in function ipv6_create_tempaddr in addrconf.c.
A new temporary address is generated if this condition is met: tmp_prefered_lft > regen_advance
tmp_prefered_lft however is an offset from tstamp, not from now.
This condition only checks that the new address is preferred until more than regen_advance from tstamp,
but it should check that the new address is preferred until more than regen_advance from now.

I submitted this issue to kernel bugzilla -> 71591 Hannes asked me to propose a patch, here it comes.

Rgds, Heiner

diff -uNr linux-3.10.32.vanilla/net/ipv6/addrconf.c linux-3.10.32.patched/net/ipv6/addrconf.c
@@ -1111,8 +1111,9 @@
      * Lifetime is greater than REGEN_ADVANCE time units.  In particular,
      * an implementation must not create a temporary address with a zero
      * Preferred Lifetime.
+     * Note that tmp_prefered_lft is relative to ifp->tstamp not now.
      */
-    if (tmp_prefered_lft <= regen_advance) {
+    if (tmp_prefered_lft <= regen_advance + age) {
         in6_ifa_put(ifp);
         in6_dev_put(idev);
         ret = -1;