4 files changed, 83 insertions, 57 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index cd620fab41b0..6b43c8c88f19 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -710,24 +710,27 @@ int br_fdb_dump(struct sk_buff *skb,
                 struct netlink_callback *cb,
                 struct net_device *dev,
                 struct net_device *filter_dev,
-                int idx)
+                int *idx)
 {
         struct net_bridge *br = netdev_priv(dev);
+        int err = 0;
         int i;
 
         if (!(dev->priv_flags & IFF_EBRIDGE))
                 goto out;
 
-        if (!filter_dev)
-                idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
+        if (!filter_dev) {
+                err = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
+                if (err < 0)
+                        goto out;
+        }
 
         for (i = 0; i < BR_HASH_SIZE; i++) {
                 struct net_bridge_fdb_entry *f;
 
                 hlist_for_each_entry_rcu(f, &br->hash[i], hlist) {
-                        int err;
 
-                        if (idx < cb->args[0])
+                        if (*idx < cb->args[2])
                                 goto skip;
 
                         if (filter_dev &&
@@ -750,17 +753,15 @@ int br_fdb_dump(struct sk_buff *skb,
                                             cb->nlh->nlmsg_seq,
                                             RTM_NEWNEIGH,
                                             NLM_F_MULTI);
-                        if (err < 0) {
-                                cb->args[1] = err;
-                                break;
-                        }
+                        if (err < 0)
+                                goto out;
 skip:
-                        ++idx;
+                        *idx += 1;
                 }
         }
 
 out:
-        return idx;
+        return err;
 }
 
 /* Update (create or replace) forwarding database entry */
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 2379b2b865c9..3d36493f4487 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -508,7 +508,7 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
 int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct net_device *dev,
                const unsigned char *addr, u16 vid, u16 nlh_flags);
 int br_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
-                struct net_device *dev, struct net_device *fdev, int idx);
+                struct net_device *dev, struct net_device *fdev, int *idx);
 int br_fdb_sync_static(struct net_bridge *br, struct net_bridge_port *p);
 void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p);
 int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 318fc5231b2b..1dfca1c3f8f5 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -3068,7 +3068,7 @@ static int nlmsg_populate_fdb(struct sk_buff *skb,
         seq = cb->nlh->nlmsg_seq;
 
         list_for_each_entry(ha, &list->list, list) {
-                if (*idx < cb->args[0])
+                if (*idx < cb->args[2])
                         goto skip;
 
                 err = nlmsg_populate_fdb_fill(skb, dev, ha->addr, 0,
@@ -3095,19 +3095,18 @@ int ndo_dflt_fdb_dump(struct sk_buff *skb,
                       struct netlink_callback *cb,
                       struct net_device *dev,
                       struct net_device *filter_dev,
-                      int idx)
+                      int *idx)
 {
         int err;
 
         netif_addr_lock_bh(dev);
-        err = nlmsg_populate_fdb(skb, cb, dev, &idx, &dev->uc);
+        err = nlmsg_populate_fdb(skb, cb, dev, idx, &dev->uc);
         if (err)
                 goto out;
-        nlmsg_populate_fdb(skb, cb, dev, &idx, &dev->mc);
+        nlmsg_populate_fdb(skb, cb, dev, idx, &dev->mc);
 out:
         netif_addr_unlock_bh(dev);
-        cb->args[1] = err;
-        return idx;
+        return err;
 }
 EXPORT_SYMBOL(ndo_dflt_fdb_dump);
 
@@ -3120,9 +3119,13 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
         const struct net_device_ops *cops = NULL;
         struct ifinfomsg *ifm = nlmsg_data(cb->nlh);
         struct net *net = sock_net(skb->sk);
+        struct hlist_head *head;
         int brport_idx = 0;
         int br_idx = 0;
-        int idx = 0;
+        int h, s_h;
+        int idx = 0, s_idx;
+        int err = 0;
+        int fidx = 0;
 
         if (nlmsg_parse(cb->nlh, sizeof(struct ifinfomsg), tb, IFLA_MAX,
                         ifla_policy) == 0) {
@@ -3140,49 +3143,71 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
                 ops = br_dev->netdev_ops;
         }
 
-        cb->args[1] = 0;
-        for_each_netdev(net, dev) {
-                if (brport_idx && (dev->ifindex != brport_idx))
-                        continue;
+        s_h = cb->args[0];
+        s_idx = cb->args[1];
 
-                if (!br_idx) { /* user did not specify a specific bridge */
-                        if (dev->priv_flags & IFF_BRIDGE_PORT) {
-                                br_dev = netdev_master_upper_dev_get(dev);
-                                cops = br_dev->netdev_ops;
-                        }
+        for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
+                idx = 0;
+                head = &net->dev_index_head[h];
+                hlist_for_each_entry(dev, head, index_hlist) {
 
-                } else {
-                        if (dev != br_dev &&
-                            !(dev->priv_flags & IFF_BRIDGE_PORT))
+                        if (brport_idx && (dev->ifindex != brport_idx))
                                 continue;
 
-                        if (br_dev != netdev_master_upper_dev_get(dev) &&
-                            !(dev->priv_flags & IFF_EBRIDGE))
-                                continue;
+                        if (!br_idx) { /* user did not specify a specific bridge */
+                                if (dev->priv_flags & IFF_BRIDGE_PORT) {
+                                        br_dev = netdev_master_upper_dev_get(dev);
+                                        cops = br_dev->netdev_ops;
+                                }
+                        } else {
+                                if (dev != br_dev &&
+                                    !(dev->priv_flags & IFF_BRIDGE_PORT))
+                                        continue;
 
-                        cops = ops;
-                }
+                                if (br_dev != netdev_master_upper_dev_get(dev) &&
+                                    !(dev->priv_flags & IFF_EBRIDGE))
+                                        continue;
+                                cops = ops;
+                        }
 
-                if (dev->priv_flags & IFF_BRIDGE_PORT) {
-                        if (cops && cops->ndo_fdb_dump)
-                                idx = cops->ndo_fdb_dump(skb, cb, br_dev, dev,
-                                                         idx);
-                }
-                if (cb->args[1] == -EMSGSIZE)
-                        break;
+                        if (idx < s_idx)
+                                goto cont;
 
-                if (dev->netdev_ops->ndo_fdb_dump)
-                        idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, dev, NULL,
-                                                            idx);
-                else
-                        idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
-                if (cb->args[1] == -EMSGSIZE)
-                        break;
+                        if (dev->priv_flags & IFF_BRIDGE_PORT) {
+                                if (cops && cops->ndo_fdb_dump) {
+                                        err = cops->ndo_fdb_dump(skb, cb,
+                                                                br_dev, dev,
+                                                                &fidx);
+                                        if (err == -EMSGSIZE)
+                                                goto out;
+                                }
+                        }
 
-                cops = NULL;
+                        if (dev->netdev_ops->ndo_fdb_dump)
+                                err = dev->netdev_ops->ndo_fdb_dump(skb, cb,
+                                                                    dev, NULL,
+                                                                    &fidx);
+                        else
+                                err = ndo_dflt_fdb_dump(skb, cb, dev, NULL,
+                                                        &fidx);
+                        if (err == -EMSGSIZE)
+                                goto out;
+
+                        cops = NULL;
+
+                        /* reset fdb offset to 0 for rest of the interfaces */
+                        cb->args[2] = 0;
+                        fidx = 0;
+cont:
+                        idx++;
+                }
         }
 
-        cb->args[0] = idx;
+out:
+        cb->args[0] = h;
+        cb->args[1] = idx;
+        cb->args[2] = fidx;
+
         return skb->len;
 }
 
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 1031a0327fff..10b819308439 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -1042,7 +1042,7 @@ static int switchdev_port_fdb_dump_cb(struct switchdev_obj *obj)
         struct nlmsghdr *nlh;
         struct ndmsg *ndm;
 
-        if (dump->idx < dump->cb->args[0])
+        if (dump->idx < dump->cb->args[2])
                 goto skip;
 
         nlh = nlmsg_put(dump->skb, portid, seq, RTM_NEWNEIGH,
@@ -1089,7 +1089,7 @@ nla_put_failure:
  */
 int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
                             struct net_device *dev,
-                            struct net_device *filter_dev, int idx)
+                            struct net_device *filter_dev, int *idx)
 {
         struct switchdev_fdb_dump dump = {
                 .fdb.obj.orig_dev = dev,
@@ -1097,14 +1097,14 @@ int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
                 .dev = dev,
                 .skb = skb,
                 .cb = cb,
-                .idx = idx,
+                .idx = *idx,
         };
         int err;
 
         err = switchdev_port_obj_dump(dev, &dump.fdb.obj,
                                       switchdev_port_fdb_dump_cb);
-        cb->args[1] = err;
-        return dump.idx;
+        *idx = dump.idx;
+        return err;
 }
 EXPORT_SYMBOL_GPL(switchdev_port_fdb_dump);