Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56989f6d authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

genetlink: mark families as __ro_after_init 



Now genl_register_family() is the only thing (other than the
users themselves, perhaps, but I didn't find any doing that)
writing to the family struct.

In all families that I found, genl_register_family() is only
called from __init functions (some indirectly, in which case
I've add __init annotations to clarifly things), so all can
actually be marked __ro_after_init.

This protects the data structure from accidental corruption.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ae0f17d

drivers/acpi/event.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static const struct genl_multicast_group acpi_event_mcgrps[] = { 
	{ .name = ACPI_GENL_MCAST_GROUP_NAME, },

};



static struct genl_family acpi_event_genl_family = {

static struct genl_family acpi_event_genl_family __ro_after_init = {

	.module = THIS_MODULE,

	.name = ACPI_GENL_FAMILY_NAME,

	.version = ACPI_GENL_VERSION,
@@ -144,7 +144,7 @@ int acpi_bus_generate_netlink_event(const char *device_class, 


EXPORT_SYMBOL(acpi_bus_generate_netlink_event);



static int acpi_event_genetlink_init(void)

static int __init acpi_event_genetlink_init(void)

{

	return genl_register_family(&acpi_event_genl_family);

}

drivers/net/gtp.c

+1 −1
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ static const struct genl_ops gtp_genl_ops[] = { 
	},

};



static struct genl_family gtp_genl_family = {

static struct genl_family gtp_genl_family __ro_after_init = {

	.name		= "gtp",

	.version	= 0,

	.hdrsize	= 0,

drivers/net/macsec.c

+1 −1
Original line number Diff line number Diff line
@@ -2648,7 +2648,7 @@ static const struct genl_ops macsec_genl_ops[] = { 
	},

};



static struct genl_family macsec_fam = {

static struct genl_family macsec_fam __ro_after_init = {

	.name		= MACSEC_GENL_NAME,

	.hdrsize	= 0,

	.version	= MACSEC_GENL_VERSION,

drivers/net/team/team.c

+2 −2
Original line number Diff line number Diff line
@@ -2740,7 +2740,7 @@ static const struct genl_multicast_group team_nl_mcgrps[] = { 
	{ .name = TEAM_GENL_CHANGE_EVENT_MC_GRP_NAME, },

};



static struct genl_family team_nl_family = {

static struct genl_family team_nl_family __ro_after_init = {

	.name		= TEAM_GENL_NAME,

	.version	= TEAM_GENL_VERSION,

	.maxattr	= TEAM_ATTR_MAX,
@@ -2773,7 +2773,7 @@ static int team_nl_send_event_port_get(struct team *team, 
					  port);

}



static int team_nl_init(void)

static int __init team_nl_init(void)

{

	return genl_register_family(&team_nl_family);

}

drivers/net/wireless/mac80211_hwsim.c

+2 −2
Original line number Diff line number Diff line
@@ -3228,7 +3228,7 @@ static const struct genl_ops hwsim_ops[] = { 
	},

};



static struct genl_family hwsim_genl_family = {

static struct genl_family hwsim_genl_family __ro_after_init = {

	.name = "MAC80211_HWSIM",

	.version = 1,

	.maxattr = HWSIM_ATTR_MAX,
@@ -3287,7 +3287,7 @@ static struct notifier_block hwsim_netlink_notifier = { 
	.notifier_call = mac80211_hwsim_netlink_notify,

};



static int hwsim_init_netlink(void)

static int __init hwsim_init_netlink(void)

{

	int rc;