diff options
author | Johannes Berg <johannes.berg@intel.com> | 2016-10-24 08:40:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-10-27 16:16:09 -0400 |
commit | 56989f6d8568c21257dcec0f5e644d5570ba3281 (patch) | |
tree | 60a6b44865e68e25dbc8bcc38d0000e12106f2d8 /net/tipc | |
parent | 2ae0f17df1cd52aafd1ab0415ea1f1dd56dc0e2a (diff) |
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>
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/netlink.c | 4 | ||||
-rw-r--r-- | net/tipc/netlink_compat.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c index 74a405bf107b..26ca8dd64ded 100644 --- a/net/tipc/netlink.c +++ b/net/tipc/netlink.c | |||
@@ -249,7 +249,7 @@ static const struct genl_ops tipc_genl_v2_ops[] = { | |||
249 | #endif | 249 | #endif |
250 | }; | 250 | }; |
251 | 251 | ||
252 | struct genl_family tipc_genl_family = { | 252 | struct genl_family tipc_genl_family __ro_after_init = { |
253 | .name = TIPC_GENL_V2_NAME, | 253 | .name = TIPC_GENL_V2_NAME, |
254 | .version = TIPC_GENL_V2_VERSION, | 254 | .version = TIPC_GENL_V2_VERSION, |
255 | .hdrsize = 0, | 255 | .hdrsize = 0, |
@@ -271,7 +271,7 @@ int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***attr) | |||
271 | return nlmsg_parse(nlh, GENL_HDRLEN, *attr, maxattr, tipc_nl_policy); | 271 | return nlmsg_parse(nlh, GENL_HDRLEN, *attr, maxattr, tipc_nl_policy); |
272 | } | 272 | } |
273 | 273 | ||
274 | int tipc_netlink_start(void) | 274 | int __init tipc_netlink_start(void) |
275 | { | 275 | { |
276 | int res; | 276 | int res; |
277 | 277 | ||
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c index 07b19931e458..e1ae8a8a2b8e 100644 --- a/net/tipc/netlink_compat.c +++ b/net/tipc/netlink_compat.c | |||
@@ -1222,7 +1222,7 @@ static struct genl_ops tipc_genl_compat_ops[] = { | |||
1222 | }, | 1222 | }, |
1223 | }; | 1223 | }; |
1224 | 1224 | ||
1225 | static struct genl_family tipc_genl_compat_family = { | 1225 | static struct genl_family tipc_genl_compat_family __ro_after_init = { |
1226 | .name = TIPC_GENL_NAME, | 1226 | .name = TIPC_GENL_NAME, |
1227 | .version = TIPC_GENL_VERSION, | 1227 | .version = TIPC_GENL_VERSION, |
1228 | .hdrsize = TIPC_GENL_HDRLEN, | 1228 | .hdrsize = TIPC_GENL_HDRLEN, |
@@ -1233,7 +1233,7 @@ static struct genl_family tipc_genl_compat_family = { | |||
1233 | .n_ops = ARRAY_SIZE(tipc_genl_compat_ops), | 1233 | .n_ops = ARRAY_SIZE(tipc_genl_compat_ops), |
1234 | }; | 1234 | }; |
1235 | 1235 | ||
1236 | int tipc_netlink_compat_start(void) | 1236 | int __init tipc_netlink_compat_start(void) |
1237 | { | 1237 | { |
1238 | int res; | 1238 | int res; |
1239 | 1239 | ||