Skip to contentSkip to conversation

net: rtnetlink: fdb dflt dump must set idx used for cb->arg[0]

PATCH Applied John Fastabend 2 participants 2 messages Mar 29, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: rtnetlink: fdb dflt dump must set idx used for cb->arg[0]

In rtnl_fdb_dump() when the fdb_dump ndo op is not populated we never set the idx value so that cb->arg[0] is always 0. Resulting in a endless loop of messages.

Introduced with this commit,

commit 090096bf3db1c281ddd034573260045888a68fea

Author: Vlad Yasevich <[email protected]>
Date:   Wed Mar 6 15:39:42 2013 +0000

net: generic fdb support for drivers without ndo_fdb_<op>

---
 net/core/rtnetlink.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/rtnetlink.c +2 -2
index 6fdfac8..d2322d7 100644
@@ -2262,7 +2262,7 @@ skip:
  * @dev: netdevice
  *
  * Default netdevice operation to dump the existing unicast address list.
- * Returns zero on success.
+ * Returns number of addresses from list put in skb.
  */
 int ndo_dflt_fdb_dump(struct sk_buff *skb,
 		      struct netlink_callback *cb,
@@ -2303,7 +2303,7 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
 		if (dev->netdev_ops->ndo_fdb_dump)
 			idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, dev, idx);
 		else
-			ndo_dflt_fdb_dump(skb, cb, dev, idx);
+			idx = ndo_dflt_fdb_dump(skb, cb, dev, idx);
 	}
 	rcu_read_unlock();
 
maintainer Applied
#1 lore raw

From: John Fastabend <[email protected]>
Date: Fri, 29 Mar 2013 11:18:37 -0700

Quoted 6 lines

In rtnl_fdb_dump() when the fdb_dump ndo op is not populated we never set the idx value so that cb->arg[0] is always 0. Resulting in a endless loop of messages.

Introduced with this commit,

Quoted 8 lines

commit 090096bf3db1c281ddd034573260045888a68fea

Author: Vlad Yasevich <[email protected]>
Date:   Wed Mar 6 15:39:42 2013 +0000

net: generic fdb support for drivers without ndo_fdb_<op>

Applied, thanks John.