bridge: fdb dumping takes a filter device

Dumping a bridge fdb dumps every fdb entry
held. With this change we are going to filter
on selected bridge port.

Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 12 insertions, 4 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 7be33667a839..6edecd11ecf0 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -676,6 +676,7 @@ errout:
 int br_fdb_dump(struct sk_buff *skb,
                 struct netlink_callback *cb,
                 struct net_device *dev,
+                struct net_device *filter_dev,
                 int idx)
 {
         struct net_bridge *br = netdev_priv(dev);
@@ -691,6 +692,10 @@ int br_fdb_dump(struct sk_buff *skb,
                         if (idx < cb->args[0])
                                 goto skip;
 
+                        if (filter_dev && (!f->dst || !f->dst->dev ||
+                                           f->dst->dev != filter_dev))
+                                goto skip;
+
                         if (fdb_fill_info(skb, br, f,
                                           NETLINK_CB(cb->skb).portid,
                                           cb->nlh->nlmsg_seq,
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 23caf5b0309e..62a7fa2e3569 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -399,7 +399,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 nlh_flags);
 int br_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
-                struct net_device *dev, 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);
 
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 27acaf7ff6d7..90a906e7ac26 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2517,6 +2517,7 @@ skip:
 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 err;
@@ -2547,13 +2548,15 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
                         br_dev = netdev_master_upper_dev_get(dev);
                         ops = br_dev->netdev_ops;
                         if (ops->ndo_fdb_dump)
-                                idx = ops->ndo_fdb_dump(skb, cb, dev, idx);
+                                idx = ops->ndo_fdb_dump(skb, cb, dev, NULL,
+                                                        idx);
                 }
 
                 if (dev->netdev_ops->ndo_fdb_dump)
-                        idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, dev, idx);
+                        idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, dev, NULL,
+                                                            idx);
                 else
-                        idx = ndo_dflt_fdb_dump(skb, cb, dev, idx);
+                        idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
         }
         rcu_read_unlock();