[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4e0db5bc0902051837o75eeb554h592a03f9506fd9b1@mail.gmail.com>
Date: Thu, 5 Feb 2009 18:37:38 -0800
From: Gautam Kachroo <gk@...stanetworks.com>
To: netdev@...r.kernel.org, davem@...emloft.net
Cc: ebiederm@...ssion.com
Subject: [PATCH] neighbour information dumping: some entries can be skipped
neightbl_dump_info and neigh_dump_table can skip entries if the
*fill*info functions return an error. This results in an incomplete
dump ((invoked by netlink requests for RTM_GETNEIGHTBL or
RTM_GETNEIGH)
nidx and idx should not be incremented if the current entry was not
placed in the output buffer
Signed-off-by: Gautam Kachroo <gk@...stanetworks.com>
---
It looks like the problem crept in with commit
426b5303eb435d98b9bee37a807be386bc2b3320
Index: linux-2.6.27.4/net/core/neighbour.c
===================================================================
--- linux-2.6.27.4.orig/net/core/neighbour.c
+++ linux-2.6.27.4/net/core/neighbour.c
@@ -2012,8 +2012,8 @@ static int neightbl_dump_info(struct sk_
if (!net_eq(neigh_parms_net(p), net))
continue;
- if (nidx++ < neigh_skip)
- continue;
+ if (nidx < neigh_skip)
+ goto next;
if (neightbl_fill_param_info(skb, tbl, p,
NETLINK_CB(cb->skb).pid,
@@ -2021,6 +2021,8 @@ static int neightbl_dump_info(struct sk_
RTM_NEWNEIGHTBL,
NLM_F_MULTI) <= 0)
goto out;
+ next:
+ nidx++;
}
neigh_skip = 0;
@@ -2100,12 +2102,10 @@ static int neigh_dump_table(struct neigh
if (h > s_h)
s_idx = 0;
for (n = tbl->hash_buckets[h], idx = 0; n; n = n->next) {
- int lidx;
if (dev_net(n->dev) != net)
continue;
- lidx = idx++;
- if (lidx < s_idx)
- continue;
+ if (idx < s_idx)
+ goto next;
if (neigh_fill_info(skb, n, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq,
RTM_NEWNEIGH,
@@ -2114,6 +2114,8 @@ static int neigh_dump_table(struct neigh
rc = -1;
goto out;
}
+ next:
+ idx++;
}
}
read_unlock_bh(&tbl->lock);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists