Commit 091e0662 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'genetlink_mcast' 



Johannes Berg says:

====================
genetlink: clean up multicast group APIs

The generic netlink multicast group registration doesn't have to
be dynamic, and can thus be simplified just like I did with the
ops. This removes some complexity in registration code.

Additionally, two users of generic netlink already use multicast
groups in a wrong way, add workarounds for those two to keep the
userspace API working, but at the same time make them not clash
with other users of multicast groups as might happen now.

While making it all a bit easier, also prevent such abuse by adding
checks to the APIs so each family can only use the groups it owns.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dbde4979 2a94fe48

drivers/acpi/event.c

+8 −17
Original line number Diff line number Diff line
@@ -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,7 +148,7 @@ int acpi_bus_generate_netlink_event(const char *device_class, 
		return result;

	}



	genlmsg_multicast(skb, 0, acpi_event_mcgrp.id, GFP_ATOMIC);

	genlmsg_multicast(&acpi_event_genl_family, skb, 0, 0, GFP_ATOMIC);

	return 0;

}
@@ -154,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

drivers/net/team/team.c

+6 −21
Original line number Diff line number Diff line
@@ -2670,15 +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(dev_net(team->dev), skb, 0,

				       team_change_event_mcgrp.id, GFP_KERNEL);

	return genlmsg_multicast_netns(&team_nl_family, dev_net(team->dev),

				       skb, 0, 0, GFP_KERNEL);

}



static int team_nl_send_event_options_get(struct team *team,
@@ -2697,23 +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,

					    ARRAY_SIZE(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)

drivers/net/wireless/mac80211_hwsim.c

+1 −2
Original line number Diff line number Diff line
@@ -2148,8 +2148,7 @@ static int hwsim_init_netlink(void) 


	printk(KERN_INFO "mac80211_hwsim: initializing netlink\n");



	rc = genl_register_family_with_ops(&hwsim_genl_family,

		hwsim_ops, ARRAY_SIZE(hwsim_ops));

	rc = genl_register_family_with_ops(&hwsim_genl_family, hwsim_ops);

	if (rc)

		goto failure;

drivers/scsi/pmcraid.c

+2 −1
Original line number Diff line number Diff line
@@ -1512,7 +1512,8 @@ static int pmcraid_notify_aen( 
	}



	result =

		genlmsg_multicast(skb, 0, pmcraid_event_family.id, GFP_ATOMIC);

		genlmsg_multicast(&pmcraid_event_family, skb, 0,

				  pmcraid_event_family.id, GFP_ATOMIC);



	/* If there are no listeners, genlmsg_multicast may return non-zero

	 * value.

drivers/thermal/thermal_core.c

+9 −16
Original line number Diff line number Diff line
@@ -1606,15 +1606,17 @@ exit: 
EXPORT_SYMBOL_GPL(thermal_zone_get_zone_by_name);



#ifdef CONFIG_NET

static const struct genl_multicast_group thermal_event_mcgrps[] = {

	{ .name = THERMAL_GENL_MCAST_GROUP_NAME, },

};



static struct genl_family thermal_event_genl_family = {

	.id = GENL_ID_GENERATE,

	.name = THERMAL_GENL_FAMILY_NAME,

	.version = THERMAL_GENL_VERSION,

	.maxattr = THERMAL_GENL_ATTR_MAX,

};



static struct genl_multicast_group thermal_event_mcgrp = {

	.name = THERMAL_GENL_MCAST_GROUP_NAME,

	.mcgrps = thermal_event_mcgrps,

	.n_mcgrps = ARRAY_SIZE(thermal_event_mcgrps),

};



int thermal_generate_netlink_event(struct thermal_zone_device *tz,
@@ -1675,7 +1677,8 @@ int thermal_generate_netlink_event(struct thermal_zone_device *tz, 
		return result;

	}



	result = genlmsg_multicast(skb, 0, thermal_event_mcgrp.id, GFP_ATOMIC);

	result = genlmsg_multicast(&thermal_event_genl_family, skb, 0,

				   0, GFP_ATOMIC);

	if (result)

		dev_err(&tz->device, "Failed to send netlink event:%d", result);
@@ -1685,17 +1688,7 @@ EXPORT_SYMBOL_GPL(thermal_generate_netlink_event); 


static int genetlink_init(void)

{

	int result;



	result = genl_register_family(&thermal_event_genl_family);

	if (result)

		return result;



	result = genl_register_mc_group(&thermal_event_genl_family,

					&thermal_event_mcgrp);

	if (result)

		genl_unregister_family(&thermal_event_genl_family);

	return result;

	return genl_register_family(&thermal_event_genl_family);

}



static void genetlink_exit(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE