net: make vid as a parameter for ndo_fdb_add/ndo_fdb_del

Do the work of parsing NDA_VLAN directly in rtnetlink code, pass simple
u16 vid to drivers from there.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Andy Gospodarek <gospo@cumulusnetworks.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 49 insertions, 44 deletions

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 08ef4e7a2439..b1be971eb06c 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -805,33 +805,17 @@ static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge_port *p,
 /* Add new permanent fdb entry with RTM_NEWNEIGH */
 int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
                struct net_device *dev,
-               const unsigned char *addr, u16 nlh_flags)
+               const unsigned char *addr, u16 vid, u16 nlh_flags)
 {
         struct net_bridge_port *p;
         int err = 0;
         struct net_port_vlans *pv;
-        unsigned short vid = VLAN_N_VID;
 
         if (!(ndm->ndm_state & (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE))) {
                 pr_info("bridge: RTM_NEWNEIGH with invalid state %#x\n", ndm->ndm_state);
                 return -EINVAL;
         }
 
-        if (tb[NDA_VLAN]) {
-                if (nla_len(tb[NDA_VLAN]) != sizeof(unsigned short)) {
-                        pr_info("bridge: RTM_NEWNEIGH with invalid vlan\n");
-                        return -EINVAL;
-                }
-
-                vid = nla_get_u16(tb[NDA_VLAN]);
-
-                if (!vid || vid >= VLAN_VID_MASK) {
-                        pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n",
-                                vid);
-                        return -EINVAL;
-                }
-        }
-
         if (is_zero_ether_addr(addr)) {
                 pr_info("bridge: RTM_NEWNEIGH with invalid ether address\n");
                 return -EINVAL;
@@ -845,7 +829,7 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
         }
 
         pv = nbp_get_vlan_info(p);
-        if (vid != VLAN_N_VID) {
+        if (vid) {
                 if (!pv || !test_bit(vid, pv->vlan_bitmap)) {
                         pr_info("bridge: RTM_NEWNEIGH with unconfigured "
                                 "vlan %d on port %s\n", vid, dev->name);
@@ -903,27 +887,12 @@ static int __br_fdb_delete(struct net_bridge_port *p,
 /* Remove neighbor entry with RTM_DELNEIGH */
 int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
                   struct net_device *dev,
-                  const unsigned char *addr)
+                  const unsigned char *addr, u16 vid)
 {
         struct net_bridge_port *p;
         int err;
         struct net_port_vlans *pv;
-        unsigned short vid = VLAN_N_VID;
-
-        if (tb[NDA_VLAN]) {
-                if (nla_len(tb[NDA_VLAN]) != sizeof(unsigned short)) {
-                        pr_info("bridge: RTM_NEWNEIGH with invalid vlan\n");
-                        return -EINVAL;
-                }
 
-                vid = nla_get_u16(tb[NDA_VLAN]);
-
-                if (!vid || vid >= VLAN_VID_MASK) {
-                        pr_info("bridge: RTM_NEWNEIGH with invalid vlan id %d\n",
-                                vid);
-                        return -EINVAL;
-                }
-        }
         p = br_port_get_rtnl(dev);
         if (p == NULL) {
                 pr_info("bridge: RTM_DELNEIGH %s not a bridge port\n",
@@ -932,7 +901,7 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
         }
 
         pv = nbp_get_vlan_info(p);
-        if (vid != VLAN_N_VID) {
+        if (vid) {
                 if (!pv || !test_bit(vid, pv->vlan_bitmap)) {
                         pr_info("bridge: RTM_DELNEIGH with unconfigured "
                                 "vlan %d on port %s\n", vid, dev->name);
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 5b370773ad9c..1b529da8234d 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -404,9 +404,9 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
                    const unsigned char *addr, u16 vid, bool added_by_user);
 
 int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
-                  struct net_device *dev, const unsigned char *addr);
+                  struct net_device *dev, const unsigned char *addr, u16 vid);
 int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct net_device *dev,
-               const unsigned char *addr, u16 nlh_flags);
+               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);
 int br_fdb_sync_static(struct net_bridge *br, struct net_bridge_port *p);
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index b9b7dfaf202b..1a233c1c8ab4 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -36,6 +36,7 @@
 #include <linux/mutex.h>
 #include <linux/if_addr.h>
 #include <linux/if_bridge.h>
+#include <linux/if_vlan.h>
 #include <linux/pci.h>
 #include <linux/etherdevice.h>
 
@@ -2312,7 +2313,7 @@ errout:
 int ndo_dflt_fdb_add(struct ndmsg *ndm,
                      struct nlattr *tb[],
                      struct net_device *dev,
-                     const unsigned char *addr,
+                     const unsigned char *addr, u16 vid,
                      u16 flags)
 {
         int err = -EINVAL;
@@ -2338,6 +2339,28 @@ int ndo_dflt_fdb_add(struct ndmsg *ndm,
 }
 EXPORT_SYMBOL(ndo_dflt_fdb_add);
 
+static int fdb_vid_parse(struct nlattr *vlan_attr, u16 *p_vid)
+{
+        u16 vid = 0;
+
+        if (vlan_attr) {
+                if (nla_len(vlan_attr) != sizeof(u16)) {
+                        pr_info("PF_BRIDGE: RTM_NEWNEIGH with invalid vlan\n");
+                        return -EINVAL;
+                }
+
+                vid = nla_get_u16(vlan_attr);
+
+                if (!vid || vid >= VLAN_VID_MASK) {
+                        pr_info("PF_BRIDGE: RTM_NEWNEIGH with invalid vlan id %d\n",
+                                vid);
+                        return -EINVAL;
+                }
+        }
+        *p_vid = vid;
+        return 0;
+}
+
 static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
         struct net *net = sock_net(skb->sk);
@@ -2345,6 +2368,7 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh)
         struct nlattr *tb[NDA_MAX+1];
         struct net_device *dev;
         u8 *addr;
+        u16 vid;
         int err;
 
         err = nlmsg_parse(nlh, sizeof(*ndm), tb, NDA_MAX, NULL);
@@ -2370,6 +2394,10 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh)
 
         addr = nla_data(tb[NDA_LLADDR]);
 
+        err = fdb_vid_parse(tb[NDA_VLAN], &vid);
+        if (err)
+                return err;
+
         err = -EOPNOTSUPP;
 
         /* Support fdb on master device the net/bridge default case */
@@ -2378,7 +2406,8 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh)
                 struct net_device *br_dev = netdev_master_upper_dev_get(dev);
                 const struct net_device_ops *ops = br_dev->netdev_ops;
 
-                err = ops->ndo_fdb_add(ndm, tb, dev, addr, nlh->nlmsg_flags);
+                err = ops->ndo_fdb_add(ndm, tb, dev, addr, vid,
+                                       nlh->nlmsg_flags);
                 if (err)
                         goto out;
                 else
@@ -2389,9 +2418,10 @@ static int rtnl_fdb_add(struct sk_buff *skb, struct nlmsghdr *nlh)
         if ((ndm->ndm_flags & NTF_SELF)) {
                 if (dev->netdev_ops->ndo_fdb_add)
                         err = dev->netdev_ops->ndo_fdb_add(ndm, tb, dev, addr,
+                                                           vid,
                                                            nlh->nlmsg_flags);
                 else
-                        err = ndo_dflt_fdb_add(ndm, tb, dev, addr,
+                        err = ndo_dflt_fdb_add(ndm, tb, dev, addr, vid,
                                                nlh->nlmsg_flags);
 
                 if (!err) {
@@ -2409,7 +2439,7 @@ out:
 int ndo_dflt_fdb_del(struct ndmsg *ndm,
                      struct nlattr *tb[],
                      struct net_device *dev,
-                     const unsigned char *addr)
+                     const unsigned char *addr, u16 vid)
 {
         int err = -EINVAL;
 
@@ -2438,6 +2468,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh)
         struct net_device *dev;
         int err = -EINVAL;
         __u8 *addr;
+        u16 vid;
 
         if (!netlink_capable(skb, CAP_NET_ADMIN))
                 return -EPERM;
@@ -2465,6 +2496,10 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh)
 
         addr = nla_data(tb[NDA_LLADDR]);
 
+        err = fdb_vid_parse(tb[NDA_VLAN], &vid);
+        if (err)
+                return err;
+
         err = -EOPNOTSUPP;
 
         /* Support fdb on master device the net/bridge default case */
@@ -2474,7 +2509,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh)
                 const struct net_device_ops *ops = br_dev->netdev_ops;
 
                 if (ops->ndo_fdb_del)
-                        err = ops->ndo_fdb_del(ndm, tb, dev, addr);
+                        err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid);
 
                 if (err)
                         goto out;
@@ -2485,9 +2520,10 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh)
         /* Embedded bridge, macvlan, and any other device support */
         if (ndm->ndm_flags & NTF_SELF) {
                 if (dev->netdev_ops->ndo_fdb_del)
-                        err = dev->netdev_ops->ndo_fdb_del(ndm, tb, dev, addr);
+                        err = dev->netdev_ops->ndo_fdb_del(ndm, tb, dev, addr,
+                                                           vid);
                 else
-                        err = ndo_dflt_fdb_del(ndm, tb, dev, addr);
+                        err = ndo_dflt_fdb_del(ndm, tb, dev, addr, vid);
 
                 if (!err) {
                         rtnl_fdb_notify(dev, addr, RTM_DELNEIGH);