mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-23 20:24:12 +08:00
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: Johannes Berg <johannes.berg@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2ae0f17df1
commit
56989f6d85
@ -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);
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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,
|
||||
@ -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;
|
||||
|
||||
|
@ -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",
|
||||
|
@ -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,
|
||||
@ -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);
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -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",
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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 */
|
||||
@ -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);
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
@ -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;
|
||||
|
||||
|
@ -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,
|
||||
@ -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);
|
||||
}
|
||||
|
@ -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,
|
||||
@ -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);
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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),
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
@ -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,
|
||||
@ -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,
|
||||
@ -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,
|
||||
@ -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;
|
||||
|
@ -249,7 +249,7 @@ static const struct genl_ops tipc_genl_v2_ops[] = {
|
||||
#endif
|
||||
};
|
||||
|
||||
struct genl_family tipc_genl_family = {
|
||||
struct genl_family tipc_genl_family __ro_after_init = {
|
||||
.name = TIPC_GENL_V2_NAME,
|
||||
.version = TIPC_GENL_V2_VERSION,
|
||||
.hdrsize = 0,
|
||||
@ -271,7 +271,7 @@ int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***attr)
|
||||
return nlmsg_parse(nlh, GENL_HDRLEN, *attr, maxattr, tipc_nl_policy);
|
||||
}
|
||||
|
||||
int tipc_netlink_start(void)
|
||||
int __init tipc_netlink_start(void)
|
||||
{
|
||||
int res;
|
||||
|
||||
|
@ -1222,7 +1222,7 @@ static struct genl_ops tipc_genl_compat_ops[] = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct genl_family tipc_genl_compat_family = {
|
||||
static struct genl_family tipc_genl_compat_family __ro_after_init = {
|
||||
.name = TIPC_GENL_NAME,
|
||||
.version = TIPC_GENL_VERSION,
|
||||
.hdrsize = TIPC_GENL_HDRLEN,
|
||||
@ -1233,7 +1233,7 @@ static struct genl_family tipc_genl_compat_family = {
|
||||
.n_ops = ARRAY_SIZE(tipc_genl_compat_ops),
|
||||
};
|
||||
|
||||
int tipc_netlink_compat_start(void)
|
||||
int __init tipc_netlink_compat_start(void)
|
||||
{
|
||||
int res;
|
||||
|
||||
|
@ -576,7 +576,7 @@ static const struct genl_multicast_group wimax_gnl_mcgrps[] = {
|
||||
{ .name = "msg", },
|
||||
};
|
||||
|
||||
struct genl_family wimax_gnl_family = {
|
||||
struct genl_family wimax_gnl_family __ro_after_init = {
|
||||
.name = "WiMAX",
|
||||
.version = WIMAX_GNL_VERSION,
|
||||
.hdrsize = 0,
|
||||
|
@ -12586,7 +12586,7 @@ static const struct genl_ops nl80211_ops[] = {
|
||||
},
|
||||
};
|
||||
|
||||
static struct genl_family nl80211_fam = {
|
||||
static struct genl_family nl80211_fam __ro_after_init = {
|
||||
.name = NL80211_GENL_NAME, /* have users key off the name instead */
|
||||
.hdrsize = 0, /* no private header */
|
||||
.version = 1, /* no particular meaning now */
|
||||
@ -14563,7 +14563,7 @@ void nl80211_send_ap_stopped(struct wireless_dev *wdev)
|
||||
|
||||
/* initialisation/exit functions */
|
||||
|
||||
int nl80211_init(void)
|
||||
int __init nl80211_init(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user