From patchwork Fri Dec 16 19:27:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Figg X-Patchwork-Id: 131891 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 61F8C1007DB for ; Sat, 17 Dec 2011 06:27:17 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RbdR0-0004U4-V4; Fri, 16 Dec 2011 19:27:11 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RbdQz-0004Te-9o for kernel-team@lists.ubuntu.com; Fri, 16 Dec 2011 19:27:09 +0000 Received: from static-50-53-107-235.bvtn.or.frontiernet.net ([50.53.107.235] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RbdQy-0001I1-Um for kernel-team@lists.ubuntu.com; Fri, 16 Dec 2011 19:27:09 +0000 From: Brad Figg To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] addrconf.c: Prevent missing IPv6 addresses Date: Fri, 16 Dec 2011 11:27:00 -0800 Message-Id: <1324063620-4185-2-git-send-email-brad.figg@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1324063620-4185-1-git-send-email-brad.figg@canonical.com> References: <1324063620-4185-1-git-send-email-brad.figg@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Neil Wilson BugLink: http://bugs.launchpad.net/bugs/863394 Commit 5d5619b40c2474de01c64bdf6bb9f1211d3e967a introduced an error that prevents certain IPv6 addresses showing up in netlink 'dump' listings. This patch backports the corrections from commit 234b27c3fd58fc0e15c04dd0fbf4337fac9c2a06 Signed-off-by: Brad Figg --- 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 8ac3d09..a5386de 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3523,6 +3523,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: @@ -3536,6 +3538,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: @@ -3549,6 +3553,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: