From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolay Aleksandrov Subject: [PATCH net] net: ipmr: fix unresolved entry dumps Date: Wed, 17 Oct 2018 22:34:34 +0300 Message-ID: <20181017193434.11383-1-nikolay@cumulusnetworks.com> References: <7e1a20a0-9ab2-5680-bde9-185c72242680@cumulusnetworks.com> Cc: davem@davemloft.net, Nikolay Aleksandrov To: netdev@vger.kernel.org Return-path: Received: from mail-wm1-f65.google.com ([209.85.128.65]:50262 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728122AbeJRDbv (ORCPT ); Wed, 17 Oct 2018 23:31:51 -0400 Received: by mail-wm1-f65.google.com with SMTP id i8-v6so3128802wmg.0 for ; Wed, 17 Oct 2018 12:34:41 -0700 (PDT) In-Reply-To: <7e1a20a0-9ab2-5680-bde9-185c72242680@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org List-ID: If the skb space ends in an unresolved entry while dumping we'll miss some unresolved entries. The reason is due to zeroing the entry counter between dumping resolved and unresolved mfc entries. We should just keep counting until the whole table is dumped and zero when we move to the next as we have a separate table counter. Reported-by: Colin Ian King Fixes: 8fb472c09b9d ("ipmr: improve hash scalability") Signed-off-by: Nikolay Aleksandrov --- Dropped Yuval's mail because it bounces. net/ipv4/ipmr_base.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/ipv4/ipmr_base.c b/net/ipv4/ipmr_base.c index 1ad9aa62a97b..eab8cd5ec2f5 100644 --- a/net/ipv4/ipmr_base.c +++ b/net/ipv4/ipmr_base.c @@ -296,8 +296,6 @@ int mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb, next_entry: e++; } - e = 0; - s_e = 0; spin_lock_bh(lock); list_for_each_entry(mfc, &mrt->mfc_unres_queue, list) { -- 2.17.2