[kernel] r18364 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Thu Dec  8 01:37:26 2011
New Revision: 18364

Log:
ipv6: Allow inet6_dump_addr() to handle more than 64 addresses (Closes: #651255)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/ipv6-Allow-inet6_dump_addr-to-handle-more-than-64-ad.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/40

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Wed Dec  7 08:57:22 2011	(r18363)
+++ dists/squeeze/linux-2.6/debian/changelog	Thu Dec  8 01:37:26 2011	(r18364)
@@ -44,6 +44,8 @@
     and the bug report which this closes: #650160.
   * gro: reset vlan_tci on reuse
   * xfrm: Fix key lengths for rfc3686(ctr(aes)) (Closes: #650652)
+  * ipv6: Allow inet6_dump_addr() to handle more than 64 addresses
+    (Closes: #651255)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 10 Nov 2011 02:28:55 +0000
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/ipv6-Allow-inet6_dump_addr-to-handle-more-than-64-ad.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/ipv6-Allow-inet6_dump_addr-to-handle-more-than-64-ad.patch	Thu Dec  8 01:37:26 2011	(r18364)
@@ -0,0 +1,51 @@
+From: Eric Dumazet <eric.dumazet at gmail.com>
+Date: Mon, 9 Nov 2009 07:40:17 +0000
+Subject: [PATCH] ipv6: Allow inet6_dump_addr() to handle more than 64
+ addresses
+
+commit bcd323262a94b14b84341982b90443a76a477861 upstream.
+
+Apparently, inet6_dump_addr() is not able to handle more than
+64 ipv6 addresses per device. We must break from inner loops
+in case skb is full, or else cursor is put at the end of list.
+
+Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/ipv6/addrconf.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
+index f9f7fd6..0ab39fe 100644
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -3519,6 +3519,8 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
+ 							cb->nlh->nlmsg_seq,
+ 							RTM_NEWADDR,
+ 							NLM_F_MULTI);
++				if (err <= 0)
++					break;
+ 			}
+ 			break;
+ 		case MULTICAST_ADDR:
+@@ -3532,6 +3534,8 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
+ 							  cb->nlh->nlmsg_seq,
+ 							  RTM_GETMULTICAST,
+ 							  NLM_F_MULTI);
++				if (err <= 0)
++					break;
+ 			}
+ 			break;
+ 		case ANYCAST_ADDR:
+@@ -3545,6 +3549,8 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
+ 							  cb->nlh->nlmsg_seq,
+ 							  RTM_GETANYCAST,
+ 							  NLM_F_MULTI);
++				if (err <= 0)
++					break;
+ 			}
+ 			break;
+ 		default:
+-- 
+1.7.7.3
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/40
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/40	Wed Dec  7 08:57:22 2011	(r18363)
+++ dists/squeeze/linux-2.6/debian/patches/series/40	Thu Dec  8 01:37:26 2011	(r18364)
@@ -32,3 +32,4 @@
 
 + bugfix/all/gro-reset-vlan_tci-on-reuse.patch
 + bugfix/all/xfrm-Fix-key-lengths-for-rfc3686-ctr-aes.patch
++ bugfix/all/ipv6-Allow-inet6_dump_addr-to-handle-more-than-64-ad.patch