[kernel] r15919 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series
Ben Hutchings
benh at alioth.debian.org
Thu Jul 1 00:12:45 UTC 2010
Author: benh
Date: Thu Jul 1 00:12:25 2010
New Revision: 15919
Log:
ipv6: Fix a couple of bugs affecting temporary address lifetimes
Added:
dists/sid/linux-2.6/debian/patches/bugfix/all/ipv6-Clamp-reported-valid_lft-to-a-minimum-of-0.patch
dists/sid/linux-2.6/debian/patches/bugfix/all/ipv6-Use-interface-max_desync_factor.patch
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/series/16
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Wed Jun 30 06:48:16 2010 (r15918)
+++ dists/sid/linux-2.6/debian/changelog Thu Jul 1 00:12:25 2010 (r15919)
@@ -39,6 +39,9 @@
* linux-base: If the disk ID update process fails, give the user a
chance to retry or change their answers (Closes: #585609)
* asix: fix setting mac address for AX88772 (Closes: #587580)
+ * ipv6: Clamp reported valid_lft to a minimum of 0 (Closes: #514644)
+ * ipv6: Use interface max_desync_factor instead of static default
+ (Closes: #514646)
[ Aurelien Jarno ]
* [sh4] fix sh_tmu clocksource following recent nohz changes.
Added: dists/sid/linux-2.6/debian/patches/bugfix/all/ipv6-Clamp-reported-valid_lft-to-a-minimum-of-0.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ipv6-Clamp-reported-valid_lft-to-a-minimum-of-0.patch Thu Jul 1 00:12:25 2010 (r15919)
@@ -0,0 +1,39 @@
+Subject: [PATCH 1/2] ipv6: Clamp reported valid_lft to a minimum of 0
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 26 Jun 2010 22:37:47 +0100
+
+commit f56619fc72407561b00c52244a2caa53d730bc4a upstream.
+
+Since addresses are only revalidated every 2 minutes, the reported
+valid_lft can underflow shortly before the address is deleted.
+Clamp it to a minimum of 0, as for prefered_lft.
+
+Reported-by: Piotr Lewandowski <piotr.lewandowski at gmail.com>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/ipv6/addrconf.c | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
+index b97bb1f..1459eed 100644
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -3492,8 +3492,12 @@ static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,
+ preferred -= tval;
+ else
+ preferred = 0;
+- if (valid != INFINITY_LIFE_TIME)
+- valid -= tval;
++ if (valid != INFINITY_LIFE_TIME) {
++ if (valid > tval)
++ valid -= tval;
++ else
++ valid = 0;
++ }
+ }
+ } else {
+ preferred = INFINITY_LIFE_TIME;
+--
+1.7.1
+
Added: dists/sid/linux-2.6/debian/patches/bugfix/all/ipv6-Use-interface-max_desync_factor.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ipv6-Use-interface-max_desync_factor.patch Thu Jul 1 00:12:25 2010 (r15919)
@@ -0,0 +1,52 @@
+Subject: [PATCH 2/2] ipv6: Use interface max_desync_factor instead of static default
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 26 Jun 2010 22:42:56 +0100
+
+commit 784e2710ce3588d8316dc8efac9ecbebaeaf7c35 upstream.
+
+max_desync_factor can be configured per-interface, but nothing is
+using the value.
+
+Reported-by: Piotr Lewandowski <piotr.lewandowski at gmail.com>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/ipv6/addrconf.c | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
+index 1459eed..ec8c92f 100644
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -121,8 +121,6 @@ static inline void addrconf_sysctl_unregister(struct inet6_dev *idev)
+ static int __ipv6_regen_rndid(struct inet6_dev *idev);
+ static int __ipv6_try_regen_rndid(struct inet6_dev *idev, struct in6_addr *tmpaddr);
+ static void ipv6_regen_rndid(unsigned long data);
+-
+-static int desync_factor = MAX_DESYNC_FACTOR * HZ;
+ #endif
+
+ static int ipv6_generate_eui64(u8 *eui, struct net_device *dev);
+@@ -890,7 +888,8 @@ retry:
+ idev->cnf.temp_valid_lft);
+ tmp_prefered_lft = min_t(__u32,
+ ifp->prefered_lft,
+- idev->cnf.temp_prefered_lft - desync_factor / HZ);
++ idev->cnf.temp_prefered_lft -
++ idev->cnf.max_desync_factor);
+ tmp_plen = ifp->prefix_len;
+ max_addresses = idev->cnf.max_addresses;
+ tmp_cstamp = ifp->cstamp;
+@@ -1650,7 +1649,8 @@ static void ipv6_regen_rndid(unsigned long data)
+
+ expires = jiffies +
+ idev->cnf.temp_prefered_lft * HZ -
+- idev->cnf.regen_max_retry * idev->cnf.dad_transmits * idev->nd_parms->retrans_time - desync_factor;
++ idev->cnf.regen_max_retry * idev->cnf.dad_transmits * idev->nd_parms->retrans_time -
++ idev->cnf.max_desync_factor * HZ;
+ if (time_before(expires, jiffies)) {
+ printk(KERN_WARNING
+ "ipv6_regen_rndid(): too short regeneration interval; timer disabled for %s.\n",
+--
+1.7.1
+
Modified: dists/sid/linux-2.6/debian/patches/series/16
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/16 Wed Jun 30 06:48:16 2010 (r15918)
+++ dists/sid/linux-2.6/debian/patches/series/16 Thu Jul 1 00:12:25 2010 (r15919)
@@ -161,3 +161,5 @@
+ bugfix/all/3c59x-Use-fine-grained-locks-for-MII-and-windowed-regs.patch
+ bugfix/x86/Revert-tpm-autoload-tpm_tis-based-on-system-PnP-IDs.patch
+ bugfix/all/asix-fix-setting-mac-address-for-AX88772.patch
++ bugfix/all/ipv6-Clamp-reported-valid_lft-to-a-minimum-of-0.patch
++ bugfix/all/ipv6-Use-interface-max_desync_factor.patch
More information about the Kernel-svn-changes
mailing list