genetlink: make multicast groups const, prevent abuse

Register generic netlink multicast groups as an array with
the family and give them contiguous group IDs. Then instead
of passing the global group ID to the various functions that
send messages, pass the ID relative to the family - for most
families that's just 0 because the only have one group.

This avoids the list_head and ID in each group, adding a new
field for the mcast group ID offset to the family.

At the same time, this allows us to prevent abusing groups
again like the quota and dropmon code did, since we can now
check that a family only uses a group it owns.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 20 deletions

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 2721e29935a6..0715de50b3dc 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2670,16 +2670,15 @@ static const struct genl_ops team_nl_ops[] = {
         },
 };
 
-static struct genl_multicast_group team_change_event_mcgrp = {
-        .name = TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME,
+static const struct genl_multicast_group team_nl_mcgrps[] = {
+        { .name = TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME, },
 };
 
 static int team_nl_send_multicast(struct sk_buff *skb,
                                   struct team *team, u32 portid)
 {
         return genlmsg_multicast_netns(&team_nl_family, dev_net(team->dev),
-                                       skb, 0, team_change_event_mcgrp.id,
-                                       GFP_KERNEL);
+                                       skb, 0, 0, GFP_KERNEL);
 }
 
 static int team_nl_send_event_options_get(struct team *team,
@@ -2698,22 +2697,8 @@ static int team_nl_send_event_port_get(struct team *team,
 
 static int team_nl_init(void)
 {
-        int err;
-
-        err = genl_register_family_with_ops(&team_nl_family, team_nl_ops);
-        if (err)
-                return err;
-
-        err = genl_register_mc_group(&team_nl_family, &team_change_event_mcgrp);
-        if (err)
-                goto err_change_event_grp_reg;
-
-        return 0;
-
-err_change_event_grp_reg:
-        genl_unregister_family(&team_nl_family);
-
-        return err;
+        return genl_register_family_with_ops_groups(&team_nl_family, team_nl_ops,
+                                                    team_nl_mcgrps);
 }
 
 static void team_nl_fini(void)