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, 8 insertions, 18 deletions

diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 68a8755202ec..aeb5aa6ce068 100644
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
@@ -78,15 +78,17 @@ enum {
 #define ACPI_GENL_VERSION               0x01
 #define ACPI_GENL_MCAST_GROUP_NAME      "acpi_mc_group"
 
+static const struct genl_multicast_group acpi_event_mcgrps[] = {
+        { .name = ACPI_GENL_MCAST_GROUP_NAME, },
+};
+
 static struct genl_family acpi_event_genl_family = {
         .id = GENL_ID_GENERATE,
         .name = ACPI_GENL_FAMILY_NAME,
         .version = ACPI_GENL_VERSION,
         .maxattr = ACPI_GENL_ATTR_MAX,
-};
-
-static struct genl_multicast_group acpi_event_mcgrp = {
-        .name = ACPI_GENL_MCAST_GROUP_NAME,
+        .mcgrps = acpi_event_mcgrps,
+        .n_mcgrps = ARRAY_SIZE(acpi_event_mcgrps),
 };
 
 int acpi_bus_generate_netlink_event(const char *device_class,
@@ -146,8 +148,7 @@ int acpi_bus_generate_netlink_event(const char *device_class,
                 return result;
         }
 
-        genlmsg_multicast(&acpi_event_genl_family,
-                          skb, 0, acpi_event_mcgrp.id, GFP_ATOMIC);
+        genlmsg_multicast(&acpi_event_genl_family, skb, 0, 0, GFP_ATOMIC);
         return 0;
 }
 
@@ -155,18 +156,7 @@ EXPORT_SYMBOL(acpi_bus_generate_netlink_event);
 
 static int acpi_event_genetlink_init(void)
 {
-        int result;
-
-        result = genl_register_family(&acpi_event_genl_family);
-        if (result)
-                return result;
-
-        result = genl_register_mc_group(&acpi_event_genl_family,
-                                        &acpi_event_mcgrp);
-        if (result)
-                genl_unregister_family(&acpi_event_genl_family);
-
-        return result;
+        return genl_register_family(&acpi_event_genl_family);
 }
 
 #else