bridge: mcast: Remove br_mdb_parse()

The parsing of the netlink messages and the validity checks are now
performed in br_mdb_config_init() so we can remove br_mdb_parse().

This finally allows us to stop passing netlink attributes deep in the
MDB control path and only use the MDB configuration structure.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index b459886af6752b32bda8fd7ed9c5cdd2dd8ac56d..d0e018628f5d5abe3444aec4cffe88e6d294260f 100644 (file)
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -754,73 +754,6 @@ static const struct nla_policy br_mdbe_attrs_pol[MDBE_ATTR_MAX + 1] = {
                                              sizeof(struct in6_addr)),
 };
 
-static int br_mdb_parse(struct sk_buff *skb, struct nlmsghdr *nlh,
-                       struct net_device **pdev, struct br_mdb_entry **pentry,
-                       struct nlattr **mdb_attrs, struct netlink_ext_ack *extack)
-{
-       struct net *net = sock_net(skb->sk);
-       struct br_mdb_entry *entry;
-       struct br_port_msg *bpm;
-       struct nlattr *tb[MDBA_SET_ENTRY_MAX+1];
-       struct net_device *dev;
-       int err;
-
-       err = nlmsg_parse_deprecated(nlh, sizeof(*bpm), tb,
-                                    MDBA_SET_ENTRY_MAX, NULL, NULL);
-       if (err < 0)
-               return err;
-
-       bpm = nlmsg_data(nlh);
-       if (bpm->ifindex == 0) {
-               NL_SET_ERR_MSG_MOD(extack, "Invalid bridge ifindex");
-               return -EINVAL;
-       }
-
-       dev = __dev_get_by_index(net, bpm->ifindex);
-       if (dev == NULL) {
-               NL_SET_ERR_MSG_MOD(extack, "Bridge device doesn't exist");
-               return -ENODEV;
-       }
-
-       if (!netif_is_bridge_master(dev)) {
-               NL_SET_ERR_MSG_MOD(extack, "Device is not a bridge");
-               return -EOPNOTSUPP;
-       }
-
-       *pdev = dev;
-
-       if (!tb[MDBA_SET_ENTRY]) {
-               NL_SET_ERR_MSG_MOD(extack, "Missing MDBA_SET_ENTRY attribute");
-               return -EINVAL;
-       }
-       if (nla_len(tb[MDBA_SET_ENTRY]) != sizeof(struct br_mdb_entry)) {
-               NL_SET_ERR_MSG_MOD(extack, "Invalid MDBA_SET_ENTRY attribute length");
-               return -EINVAL;
-       }
-
-       entry = nla_data(tb[MDBA_SET_ENTRY]);
-       if (!is_valid_mdb_entry(entry, extack))
-               return -EINVAL;
-       *pentry = entry;
-
-       if (tb[MDBA_SET_ENTRY_ATTRS]) {
-               err = nla_parse_nested(mdb_attrs, MDBE_ATTR_MAX,
-                                      tb[MDBA_SET_ENTRY_ATTRS],
-                                      br_mdbe_attrs_pol, extack);
-               if (err)
-                       return err;
-               if (mdb_attrs[MDBE_ATTR_SOURCE] &&
-                   !is_valid_mdb_source(mdb_attrs[MDBE_ATTR_SOURCE],
-                                        entry->addr.proto, extack))
-                       return -EINVAL;
-       } else {
-               memset(mdb_attrs, 0,
-                      sizeof(struct nlattr *) * (MDBE_ATTR_MAX + 1));
-       }
-
-       return 0;
-}
-
 static struct net_bridge_mcast *
 __br_mdb_choose_context(struct net_bridge *br,
                        const struct br_mdb_entry *entry,
@@ -959,7 +892,6 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
 }
 
 static int __br_mdb_add(const struct br_mdb_config *cfg,
-                       struct nlattr **mdb_attrs,
                        struct netlink_ext_ack *extack)
 {
        int ret;
@@ -1084,23 +1016,16 @@ static int br_mdb_config_init(struct net *net, const struct nlmsghdr *nlh,
 static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,
                      struct netlink_ext_ack *extack)
 {
-       struct nlattr *mdb_attrs[MDBE_ATTR_MAX + 1];
        struct net *net = sock_net(skb->sk);
        struct net_bridge_vlan_group *vg;
-       struct br_mdb_entry *entry;
        struct net_bridge_vlan *v;
        struct br_mdb_config cfg;
-       struct net_device *dev;
        int err;
 
        err = br_mdb_config_init(net, nlh, &cfg, extack);
        if (err)
                return err;
 
-       err = br_mdb_parse(skb, nlh, &dev, &entry, mdb_attrs, extack);
-       if (err < 0)
-               return err;
-
        if (cfg.p) {
                if (cfg.p->state == BR_STATE_DISABLED && cfg.entry->state != MDB_PERMANENT) {
                        NL_SET_ERR_MSG_MOD(extack, "Port is in disabled state and entry is not permanent");
@@ -1118,19 +1043,18 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,
                list_for_each_entry(v, &vg->vlan_list, vlist) {
                        cfg.entry->vid = v->vid;
                        cfg.group.vid = v->vid;
-                       err = __br_mdb_add(&cfg, mdb_attrs, extack);
+                       err = __br_mdb_add(&cfg, extack);
                        if (err)
                                break;
                }
        } else {
-               err = __br_mdb_add(&cfg, mdb_attrs, extack);
+               err = __br_mdb_add(&cfg, extack);
        }
 
        return err;
 }
 
-static int __br_mdb_del(const struct br_mdb_config *cfg,
-                       struct nlattr **mdb_attrs)
+static int __br_mdb_del(const struct br_mdb_config *cfg)
 {
        struct br_mdb_entry *entry = cfg->entry;
        struct net_bridge *br = cfg->br;
@@ -1174,23 +1098,16 @@ unlock:
 static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
                      struct netlink_ext_ack *extack)
 {
-       struct nlattr *mdb_attrs[MDBE_ATTR_MAX + 1];
        struct net *net = sock_net(skb->sk);
        struct net_bridge_vlan_group *vg;
-       struct br_mdb_entry *entry;
        struct net_bridge_vlan *v;
        struct br_mdb_config cfg;
-       struct net_device *dev;
        int err;
 
        err = br_mdb_config_init(net, nlh, &cfg, extack);
        if (err)
                return err;
 
-       err = br_mdb_parse(skb, nlh, &dev, &entry, mdb_attrs, extack);
-       if (err < 0)
-               return err;
-
        if (cfg.p)
                vg = nbp_vlan_group(cfg.p);
        else
@@ -1203,10 +1120,10 @@ static int br_mdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
                list_for_each_entry(v, &vg->vlan_list, vlist) {
                        cfg.entry->vid = v->vid;
                        cfg.group.vid = v->vid;
-                       err = __br_mdb_del(&cfg, mdb_attrs);
+                       err = __br_mdb_del(&cfg);
                }
        } else {
-               err = __br_mdb_del(&cfg, mdb_attrs);
+               err = __br_mdb_del(&cfg);
        }
 
        return err;