Skip to content

Commit

Permalink
genetlink: mark families as __ro_after_init
Browse files Browse the repository at this point in the history
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: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
jmberg-intel authored and davem330 committed Oct 27, 2016
1 parent 2ae0f17 commit 56989f6
Show file tree
Hide file tree
Showing 35 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions drivers/acpi/event.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/gtp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/macsec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/team/team.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/mac80211_hwsim.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions drivers/scsi/pmcraid.c
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,7 @@ static struct genl_multicast_group pmcraid_mcgrps[] = {
{ .name = "events", /* not really used - see ID discussion below */ },
};

static struct genl_family pmcraid_event_family = {
static struct genl_family pmcraid_event_family __ro_after_init = {
.module = THIS_MODULE,
.name = "pmcraid",
.version = 1,
Expand All @@ -1384,7 +1384,7 @@ static struct genl_family pmcraid_event_family = {
* 0 if the pmcraid_event_family is successfully registered
* with netlink generic, non-zero otherwise
*/
static int pmcraid_netlink_init(void)
static int __init pmcraid_netlink_init(void)
{
int result;

Expand Down
2 changes: 1 addition & 1 deletion drivers/target/target_core_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ static const struct genl_multicast_group tcmu_mcgrps[] = {
};

/* Our generic netlink family */
static struct genl_family tcmu_genl_family = {
static struct genl_family tcmu_genl_family __ro_after_init = {
.module = THIS_MODULE,
.hdrsize = 0,
.name = "TCM-USER",
Expand Down
4 changes: 2 additions & 2 deletions drivers/thermal/thermal_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2163,7 +2163,7 @@ static const struct genl_multicast_group thermal_event_mcgrps[] = {
{ .name = THERMAL_GENL_MCAST_GROUP_NAME, },
};

static struct genl_family thermal_event_genl_family = {
static struct genl_family thermal_event_genl_family __ro_after_init = {
.module = THIS_MODULE,
.name = THERMAL_GENL_FAMILY_NAME,
.version = THERMAL_GENL_VERSION,
Expand Down Expand Up @@ -2235,7 +2235,7 @@ int thermal_generate_netlink_event(struct thermal_zone_device *tz,
}
EXPORT_SYMBOL_GPL(thermal_generate_netlink_event);

static int genetlink_init(void)
static int __init genetlink_init(void)
{
return genl_register_family(&thermal_event_genl_family);
}
Expand Down
2 changes: 1 addition & 1 deletion fs/dlm/netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ static struct genl_ops dlm_nl_ops[] = {
},
};

static struct genl_family family = {
static struct genl_family family __ro_after_init = {
.name = DLM_GENL_NAME,
.version = DLM_GENL_VERSION,
.ops = dlm_nl_ops,
Expand Down
2 changes: 1 addition & 1 deletion fs/quota/netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ static const struct genl_multicast_group quota_mcgrps[] = {
};

/* Netlink family structure for quota */
static struct genl_family quota_genl_family = {
static struct genl_family quota_genl_family __ro_after_init = {
.module = THIS_MODULE,
.hdrsize = 0,
.name = "VFS_DQUOT",
Expand Down
2 changes: 1 addition & 1 deletion include/linux/genl_magic_func.h
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static int CONCAT_(GENL_MAGIC_FAMILY, _genl_multicast_ ## group)( \
#undef GENL_mc_group
#define GENL_mc_group(group)

static struct genl_family ZZZ_genl_family __read_mostly = {
static struct genl_family ZZZ_genl_family __ro_after_init = {
.name = __stringify(GENL_MAGIC_FAMILY),
.version = GENL_MAGIC_VERSION,
#ifdef GENL_MAGIC_FAMILY_HDRSZ
Expand Down
2 changes: 1 addition & 1 deletion kernel/taskstats.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ static const struct genl_ops taskstats_ops[] = {
},
};

static struct genl_family family = {
static struct genl_family family __ro_after_init = {
.name = TASKSTATS_GENL_NAME,
.version = TASKSTATS_GENL_VERSION,
.maxattr = TASKSTATS_CMD_ATTR_MAX,
Expand Down
2 changes: 1 addition & 1 deletion net/batman-adv/netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ static struct genl_ops batadv_netlink_ops[] = {

};

struct genl_family batadv_netlink_family = {
struct genl_family batadv_netlink_family __ro_after_init = {
.hdrsize = 0,
.name = BATADV_NL_NAME,
.version = 1,
Expand Down
2 changes: 1 addition & 1 deletion net/core/devlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -1612,7 +1612,7 @@ static const struct genl_ops devlink_nl_ops[] = {
},
};

static struct genl_family devlink_nl_family = {
static struct genl_family devlink_nl_family __ro_after_init = {
.name = DEVLINK_GENL_NAME,
.version = DEVLINK_GENL_VERSION,
.maxattr = DEVLINK_ATTR_MAX,
Expand Down
2 changes: 1 addition & 1 deletion net/core/drop_monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ static const struct genl_ops dropmon_ops[] = {
},
};

static struct genl_family net_drop_monitor_family = {
static struct genl_family net_drop_monitor_family __ro_after_init = {
.hdrsize = 0,
.name = "NET_DM",
.version = 2,
Expand Down
2 changes: 1 addition & 1 deletion net/hsr/hsr_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ static const struct genl_ops hsr_ops[] = {
},
};

static struct genl_family hsr_genl_family = {
static struct genl_family hsr_genl_family __ro_after_init = {
.hdrsize = 0,
.name = "HSR",
.version = 1,
Expand Down
2 changes: 1 addition & 1 deletion net/ieee802154/netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static const struct genl_multicast_group ieee802154_mcgrps[] = {
[IEEE802154_BEACON_MCGRP] = { .name = IEEE802154_MCAST_BEACON_NAME, },
};

struct genl_family nl802154_family = {
struct genl_family nl802154_family __ro_after_init = {
.hdrsize = 0,
.name = IEEE802154_NL_NAME,
.version = 1,
Expand Down
4 changes: 2 additions & 2 deletions net/ieee802154/nl802154.c
Original file line number Diff line number Diff line change
Expand Up @@ -2462,7 +2462,7 @@ static const struct genl_ops nl802154_ops[] = {
#endif /* CONFIG_IEEE802154_NL802154_EXPERIMENTAL */
};

static struct genl_family nl802154_fam = {
static struct genl_family nl802154_fam __ro_after_init = {
.name = NL802154_GENL_NAME, /* have users key off the name instead */
.hdrsize = 0, /* no private header */
.version = 1, /* no particular meaning now */
Expand All @@ -2478,7 +2478,7 @@ static struct genl_family nl802154_fam = {
};

/* initialisation/exit functions */
int nl802154_init(void)
int __init nl802154_init(void)
{
return genl_register_family(&nl802154_fam);
}
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/fou.c
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ static const struct genl_ops fou_nl_ops[] = {
},
};

static struct genl_family fou_nl_family = {
static struct genl_family fou_nl_family __ro_after_init = {
.hdrsize = 0,
.name = FOU_GENL_NAME,
.version = FOU_GENL_VERSION,
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/tcp_metrics.c
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ static const struct genl_ops tcp_metrics_nl_ops[] = {
},
};

static struct genl_family tcp_metrics_nl_family = {
static struct genl_family tcp_metrics_nl_family __ro_after_init = {
.hdrsize = 0,
.name = TCP_METRICS_GENL_NAME,
.version = TCP_METRICS_GENL_VERSION,
Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/ila/ila_xlat.c
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ static const struct genl_ops ila_nl_ops[] = {
},
};

static struct genl_family ila_nl_family = {
static struct genl_family ila_nl_family __ro_after_init = {
.hdrsize = 0,
.name = ILA_GENL_NAME,
.version = ILA_GENL_VERSION,
Expand Down Expand Up @@ -627,7 +627,7 @@ static int ila_xlat_addr(struct sk_buff *skb, bool set_csum_neutral)
return 0;
}

int ila_xlat_init(void)
int __init ila_xlat_init(void)
{
int ret;

Expand Down
4 changes: 2 additions & 2 deletions net/irda/irnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static const struct genl_ops irda_nl_ops[] = {

};

static struct genl_family irda_nl_family = {
static struct genl_family irda_nl_family __ro_after_init = {
.name = IRDA_NL_NAME,
.hdrsize = 0,
.version = IRDA_NL_VERSION,
Expand All @@ -151,7 +151,7 @@ static struct genl_family irda_nl_family = {
.n_ops = ARRAY_SIZE(irda_nl_ops),
};

int irda_nl_register(void)
int __init irda_nl_register(void)
{
return genl_register_family(&irda_nl_family);
}
Expand Down
4 changes: 2 additions & 2 deletions net/l2tp/l2tp_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ static const struct genl_ops l2tp_nl_ops[] = {
},
};

static struct genl_family l2tp_nl_family = {
static struct genl_family l2tp_nl_family __ro_after_init = {
.name = L2TP_GENL_NAME,
.version = L2TP_GENL_VERSION,
.hdrsize = 0,
Expand Down Expand Up @@ -1016,7 +1016,7 @@ void l2tp_nl_unregister_ops(enum l2tp_pwtype pw_type)
}
EXPORT_SYMBOL_GPL(l2tp_nl_unregister_ops);

static int l2tp_nl_init(void)
static int __init l2tp_nl_init(void)
{
pr_info("L2TP netlink interface\n");
return genl_register_family(&l2tp_nl_family);
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/ipvs/ip_vs_ctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3865,7 +3865,7 @@ static const struct genl_ops ip_vs_genl_ops[] = {
},
};

static struct genl_family ip_vs_genl_family = {
static struct genl_family ip_vs_genl_family __ro_after_init = {
.hdrsize = 0,
.name = IPVS_GENL_NAME,
.version = IPVS_GENL_VERSION,
Expand Down
2 changes: 1 addition & 1 deletion net/netlabel/netlabel_calipso.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ static const struct genl_ops netlbl_calipso_ops[] = {
},
};

static struct genl_family netlbl_calipso_gnl_family = {
static struct genl_family netlbl_calipso_gnl_family __ro_after_init = {
.hdrsize = 0,
.name = NETLBL_NLTYPE_CALIPSO_NAME,
.version = NETLBL_PROTO_VERSION,
Expand Down
2 changes: 1 addition & 1 deletion net/netlabel/netlabel_cipso_v4.c
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ static const struct genl_ops netlbl_cipsov4_ops[] = {
},
};

static struct genl_family netlbl_cipsov4_gnl_family = {
static struct genl_family netlbl_cipsov4_gnl_family __ro_after_init = {
.hdrsize = 0,
.name = NETLBL_NLTYPE_CIPSOV4_NAME,
.version = NETLBL_PROTO_VERSION,
Expand Down
2 changes: 1 addition & 1 deletion net/netlabel/netlabel_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ static const struct genl_ops netlbl_mgmt_genl_ops[] = {
},
};

static struct genl_family netlbl_mgmt_gnl_family = {
static struct genl_family netlbl_mgmt_gnl_family __ro_after_init = {
.hdrsize = 0,
.name = NETLBL_NLTYPE_MGMT_NAME,
.version = NETLBL_PROTO_VERSION,
Expand Down
2 changes: 1 addition & 1 deletion net/netlabel/netlabel_unlabeled.c
Original file line number Diff line number Diff line change
Expand Up @@ -1372,7 +1372,7 @@ static const struct genl_ops netlbl_unlabel_genl_ops[] = {
},
};

static struct genl_family netlbl_unlabel_gnl_family = {
static struct genl_family netlbl_unlabel_gnl_family __ro_after_init = {
.hdrsize = 0,
.name = NETLBL_NLTYPE_UNLABELED_NAME,
.version = NETLBL_PROTO_VERSION,
Expand Down
2 changes: 1 addition & 1 deletion net/netlink/genetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ static const struct genl_multicast_group genl_ctrl_groups[] = {
{ .name = "notify", },
};

static struct genl_family genl_ctrl = {
static struct genl_family genl_ctrl __ro_after_init = {
.module = THIS_MODULE,
.ops = genl_ctrl_ops,
.n_ops = ARRAY_SIZE(genl_ctrl_ops),
Expand Down
2 changes: 1 addition & 1 deletion net/nfc/netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -1746,7 +1746,7 @@ static const struct genl_ops nfc_genl_ops[] = {
},
};

static struct genl_family nfc_genl_family = {
static struct genl_family nfc_genl_family __ro_after_init = {
.hdrsize = 0,
.name = NFC_GENL_NAME,
.version = NFC_GENL_VERSION,
Expand Down
10 changes: 5 additions & 5 deletions net/openvswitch/datapath.c
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ static const struct genl_ops dp_packet_genl_ops[] = {
}
};

static struct genl_family dp_packet_genl_family = {
static struct genl_family dp_packet_genl_family __ro_after_init = {
.hdrsize = sizeof(struct ovs_header),
.name = OVS_PACKET_FAMILY,
.version = OVS_PACKET_VERSION,
Expand Down Expand Up @@ -1435,7 +1435,7 @@ static const struct genl_ops dp_flow_genl_ops[] = {
},
};

static struct genl_family dp_flow_genl_family = {
static struct genl_family dp_flow_genl_family __ro_after_init = {
.hdrsize = sizeof(struct ovs_header),
.name = OVS_FLOW_FAMILY,
.version = OVS_FLOW_VERSION,
Expand Down Expand Up @@ -1821,7 +1821,7 @@ static const struct genl_ops dp_datapath_genl_ops[] = {
},
};

static struct genl_family dp_datapath_genl_family = {
static struct genl_family dp_datapath_genl_family __ro_after_init = {
.hdrsize = sizeof(struct ovs_header),
.name = OVS_DATAPATH_FAMILY,
.version = OVS_DATAPATH_VERSION,
Expand Down Expand Up @@ -2243,7 +2243,7 @@ static const struct genl_ops dp_vport_genl_ops[] = {
},
};

struct genl_family dp_vport_genl_family = {
struct genl_family dp_vport_genl_family __ro_after_init = {
.hdrsize = sizeof(struct ovs_header),
.name = OVS_VPORT_FAMILY,
.version = OVS_VPORT_VERSION,
Expand Down Expand Up @@ -2272,7 +2272,7 @@ static void dp_unregister_genl(int n_families)
genl_unregister_family(dp_genl_families[i]);
}

static int dp_register_genl(void)
static int __init dp_register_genl(void)
{
int err;
int i;
Expand Down
Loading

0 comments on commit 56989f6

Please sign in to comment.