bridge: mcast: Move checks out of critical section

The checks only require information parsed from the RTM_NEWMDB netlink
message and do not rely on any state stored in the bridge driver.
Therefore, there is no need to perform the checks in the critical
section under the multicast lock.

Move the checks out of the critical section.

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 d0e018628f5d5abe3444aec4cffe88e6d294260f..d954d8f7cb0ae5159d8c5c4c5bda721b63e8ab8d 100644 (file)
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -805,24 +805,6 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port,
        if (!brmctx)
                return -EINVAL;
 
-       /* host join errors which can happen before creating the group */
-       if (!port && !br_group_is_l2(&group)) {
-               /* don't allow any flags for host-joined IP groups */
-               if (entry->state) {
-                       NL_SET_ERR_MSG_MOD(extack, "Flags are not allowed for host groups");
-                       return -EINVAL;
-               }
-               if (!br_multicast_is_star_g(&group)) {
-                       NL_SET_ERR_MSG_MOD(extack, "Groups with sources cannot be manually host joined");
-                       return -EINVAL;
-               }
-       }
-
-       if (br_group_is_l2(&group) && entry->state != MDB_PERMANENT) {
-               NL_SET_ERR_MSG_MOD(extack, "Only permanent L2 entries allowed");
-               return -EINVAL;
-       }
-
        mp = br_multicast_new_group(br, &group);
        if (IS_ERR(mp))
                return PTR_ERR(mp);
@@ -1026,6 +1008,24 @@ static int br_mdb_add(struct sk_buff *skb, struct nlmsghdr *nlh,
        if (err)
                return err;
 
+       /* host join errors which can happen before creating the group */
+       if (!cfg.p && !br_group_is_l2(&cfg.group)) {
+               /* don't allow any flags for host-joined IP groups */
+               if (cfg.entry->state) {
+                       NL_SET_ERR_MSG_MOD(extack, "Flags are not allowed for host groups");
+                       return -EINVAL;
+               }
+               if (!br_multicast_is_star_g(&cfg.group)) {
+                       NL_SET_ERR_MSG_MOD(extack, "Groups with sources cannot be manually host joined");
+                       return -EINVAL;
+               }
+       }
+
+       if (br_group_is_l2(&cfg.group) && cfg.entry->state != MDB_PERMANENT) {
+               NL_SET_ERR_MSG_MOD(extack, "Only permanent L2 entries allowed");
+               return -EINVAL;
+       }
+
        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");