net: Fix continued iteration in rtnl_bridge_getlink() (25b1e679) · Commits · 戴 / test

Commit ('net: create generic bridge ops') broke the handling of a non-zero starting index in rtnl_bridge_getlink() (based on the old br_dump_ifinfo()). When the starting index is non-zero, we need to increment the current index for each entry that we are skipping. Also, we need to check the index before both cases, since we may previously have stopped iteration between getting information about a device from its master and from itself. Signed-off-by:

Ben Hutchings <bhutchings@solarflare.com> Tested-by:

John Fastabend <john.r.fastabend@intel.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/core/rtnetlink.c

+7 −16

Original line number	Diff line number	Diff line
		@@ -2315,27 +2315,18 @@ static int rtnl_bridge_getlink(struct sk_buff skb, struct netlink_callback cb)
		const struct net_device_ops *ops = dev->netdev_ops;
		struct net_device *master = dev->master;

		if (idx < cb->args[0])
		continue;

		if (master && master->netdev_ops->ndo_bridge_getlink) {
		const struct net_device_ops *bops = master->netdev_ops;
		int err = bops->ndo_bridge_getlink(skb, portid,
		seq, dev);

		if (err < 0)
		if (idx >= cb->args[0] &&
		master->netdev_ops->ndo_bridge_getlink(
		skb, portid, seq, dev) < 0)
		break;
		else
		idx++;
		}

		if (ops->ndo_bridge_getlink) {
		int err = ops->ndo_bridge_getlink(skb, portid,
		seq, dev);

		if (err < 0)
		if (idx >= cb->args[0] &&
		ops->ndo_bridge_getlink(skb, portid, seq, dev) < 0)
		break;
		else
		idx++;
		}
		}

Admin message