Skip to content

Commit 9f00d97

Browse files
ummakynesdavem330
authored andcommitted
netlink: hide struct module parameter in netlink_kernel_create
This patch defines netlink_kernel_create as a wrapper function of __netlink_kernel_create to hide the struct module *me parameter (which seems to be THIS_MODULE in all existing netlink subsystems). Suggested by David S. Miller. Signed-off-by: Pablo Neira Ayuso <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9785e10 commit 9f00d97

File tree

20 files changed

+31
-37
lines changed

20 files changed

+31
-37
lines changed

crypto/crypto_user.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,7 @@ static int __init crypto_user_init(void)
500500
.input = crypto_netlink_rcv,
501501
};
502502

503-
crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO,
504-
THIS_MODULE, &cfg);
503+
crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO, &cfg);
505504
if (!crypto_nlsk)
506505
return -ENOMEM;
507506

drivers/connector/connector.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,7 @@ static int __devinit cn_init(void)
264264
.input = dev->input,
265265
};
266266

267-
dev->nls = netlink_kernel_create(&init_net, NETLINK_CONNECTOR,
268-
THIS_MODULE, &cfg);
267+
dev->nls = netlink_kernel_create(&init_net, NETLINK_CONNECTOR, &cfg);
269268
if (!dev->nls)
270269
return -EIO;
271270

drivers/infiniband/core/netlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ int __init ibnl_init(void)
177177
.input = ibnl_rcv,
178178
};
179179

180-
nls = netlink_kernel_create(&init_net, NETLINK_RDMA, THIS_MODULE, &cfg);
180+
nls = netlink_kernel_create(&init_net, NETLINK_RDMA, &cfg);
181181
if (!nls) {
182182
pr_warn("Failed to create netlink socket\n");
183183
return -ENOMEM;

drivers/scsi/scsi_netlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ scsi_netlink_init(void)
501501
}
502502

503503
scsi_nl_sock = netlink_kernel_create(&init_net, NETLINK_SCSITRANSPORT,
504-
THIS_MODULE, &cfg);
504+
&cfg);
505505
if (!scsi_nl_sock) {
506506
printk(KERN_ERR "%s: register of receive handler failed\n",
507507
__func__);

drivers/scsi/scsi_transport_iscsi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2969,8 +2969,7 @@ static __init int iscsi_transport_init(void)
29692969
if (err)
29702970
goto unregister_conn_class;
29712971

2972-
nls = netlink_kernel_create(&init_net, NETLINK_ISCSI,
2973-
THIS_MODULE, &cfg);
2972+
nls = netlink_kernel_create(&init_net, NETLINK_ISCSI, &cfg);
29742973
if (!nls) {
29752974
err = -ENOBUFS;
29762975
goto unregister_session_class;

drivers/staging/gdm72xx/netlink_k.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ struct sock *netlink_init(int unit, void (*cb)(struct net_device *dev, u16 type,
9595
init_MUTEX(&netlink_mutex);
9696
#endif
9797

98-
sock = netlink_kernel_create(&init_net, unit, THIS_MODULE, &cfg);
98+
sock = netlink_kernel_create(&init_net, unit, &cfg);
9999

100100
if (sock)
101101
rcv_cb = cb;

include/linux/netlink.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ struct nlattr {
153153

154154
#include <linux/capability.h>
155155
#include <linux/skbuff.h>
156+
#include <linux/module.h>
156157
#include <net/scm.h>
157158

158159
struct net;
@@ -188,9 +189,15 @@ struct netlink_kernel_cfg {
188189
unsigned int flags;
189190
};
190191

191-
extern struct sock *netlink_kernel_create(struct net *net, int unit,
192-
struct module *module,
193-
struct netlink_kernel_cfg *cfg);
192+
extern struct sock *__netlink_kernel_create(struct net *net, int unit,
193+
struct module *module,
194+
struct netlink_kernel_cfg *cfg);
195+
static inline struct sock *
196+
netlink_kernel_create(struct net *net, int unit, struct netlink_kernel_cfg *cfg)
197+
{
198+
return __netlink_kernel_create(net, unit, THIS_MODULE, cfg);
199+
}
200+
194201
extern void netlink_kernel_release(struct sock *sk);
195202
extern int __netlink_change_ngroups(struct sock *sk, unsigned int groups);
196203
extern int netlink_change_ngroups(struct sock *sk, unsigned int groups);

kernel/audit.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -971,8 +971,7 @@ static int __init audit_init(void)
971971

972972
printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
973973
audit_default ? "enabled" : "disabled");
974-
audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT,
975-
THIS_MODULE, &cfg);
974+
audit_sock = netlink_kernel_create(&init_net, NETLINK_AUDIT, &cfg);
976975
if (!audit_sock)
977976
audit_panic("cannot initialize netlink socket");
978977
else

lib/kobject_uevent.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,7 @@ static int uevent_net_init(struct net *net)
382382
if (!ue_sk)
383383
return -ENOMEM;
384384

385-
ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT,
386-
THIS_MODULE, &cfg);
385+
ue_sk->sk = netlink_kernel_create(net, NETLINK_KOBJECT_UEVENT, &cfg);
387386
if (!ue_sk->sk) {
388387
printk(KERN_ERR
389388
"kobject_uevent: unable to create netlink socket!\n");

net/bridge/netfilter/ebt_ulog.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,7 @@ static int __init ebt_ulog_init(void)
298298
spin_lock_init(&ulog_buffers[i].lock);
299299
}
300300

301-
ebtulognl = netlink_kernel_create(&init_net, NETLINK_NFLOG,
302-
THIS_MODULE, &cfg);
301+
ebtulognl = netlink_kernel_create(&init_net, NETLINK_NFLOG, &cfg);
303302
if (!ebtulognl)
304303
ret = -ENOMEM;
305304
else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0)

net/core/rtnetlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2384,7 +2384,7 @@ static int __net_init rtnetlink_net_init(struct net *net)
23842384
.flags = NL_CFG_F_NONROOT_RECV,
23852385
};
23862386

2387-
sk = netlink_kernel_create(net, NETLINK_ROUTE, THIS_MODULE, &cfg);
2387+
sk = netlink_kernel_create(net, NETLINK_ROUTE, &cfg);
23882388
if (!sk)
23892389
return -ENOMEM;
23902390
net->rtnl = sk;

net/core/sock_diag.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ static int __net_init diag_net_init(struct net *net)
172172
.input = sock_diag_rcv,
173173
};
174174

175-
net->diag_nlsk = netlink_kernel_create(net, NETLINK_SOCK_DIAG,
176-
THIS_MODULE, &cfg);
175+
net->diag_nlsk = netlink_kernel_create(net, NETLINK_SOCK_DIAG, &cfg);
177176
return net->diag_nlsk == NULL ? -ENOMEM : 0;
178177
}
179178

net/decnet/netfilter/dn_rtmsg.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ static int __init dn_rtmsg_init(void)
130130
.input = dnrmg_receive_user_skb,
131131
};
132132

133-
dnrmg = netlink_kernel_create(&init_net,
134-
NETLINK_DNRTMSG, THIS_MODULE, &cfg);
133+
dnrmg = netlink_kernel_create(&init_net, NETLINK_DNRTMSG, &cfg);
135134
if (dnrmg == NULL) {
136135
printk(KERN_ERR "dn_rtmsg: Cannot create netlink socket");
137136
return -ENOMEM;

net/ipv4/fib_frontend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ static int __net_init nl_fib_lookup_init(struct net *net)
986986
.input = nl_fib_input,
987987
};
988988

989-
sk = netlink_kernel_create(net, NETLINK_FIB_LOOKUP, THIS_MODULE, &cfg);
989+
sk = netlink_kernel_create(net, NETLINK_FIB_LOOKUP, &cfg);
990990
if (sk == NULL)
991991
return -EAFNOSUPPORT;
992992
net->ipv4.fibnl = sk;

net/ipv4/netfilter/ipt_ULOG.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,7 @@ static int __init ulog_tg_init(void)
396396
for (i = 0; i < ULOG_MAXNLGROUPS; i++)
397397
setup_timer(&ulog_buffers[i].timer, ulog_timer, i);
398398

399-
nflognl = netlink_kernel_create(&init_net, NETLINK_NFLOG,
400-
THIS_MODULE, &cfg);
399+
nflognl = netlink_kernel_create(&init_net, NETLINK_NFLOG, &cfg);
401400
if (!nflognl)
402401
return -ENOMEM;
403402

net/netfilter/nfnetlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ static int __net_init nfnetlink_net_init(struct net *net)
241241
#endif
242242
};
243243

244-
nfnl = netlink_kernel_create(net, NETLINK_NETFILTER, THIS_MODULE, &cfg);
244+
nfnl = netlink_kernel_create(net, NETLINK_NETFILTER, &cfg);
245245
if (!nfnl)
246246
return -ENOMEM;
247247
net->nfnl_stash = nfnl;

net/netlink/af_netlink.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,9 +1526,8 @@ static void netlink_data_ready(struct sock *sk, int len)
15261526
*/
15271527

15281528
struct sock *
1529-
netlink_kernel_create(struct net *net, int unit,
1530-
struct module *module,
1531-
struct netlink_kernel_cfg *cfg)
1529+
__netlink_kernel_create(struct net *net, int unit, struct module *module,
1530+
struct netlink_kernel_cfg *cfg)
15321531
{
15331532
struct socket *sock;
15341533
struct sock *sk;
@@ -1603,8 +1602,7 @@ netlink_kernel_create(struct net *net, int unit,
16031602
sock_release(sock);
16041603
return NULL;
16051604
}
1606-
EXPORT_SYMBOL(netlink_kernel_create);
1607-
1605+
EXPORT_SYMBOL(__netlink_kernel_create);
16081606

16091607
void
16101608
netlink_kernel_release(struct sock *sk)

net/netlink/genetlink.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -922,8 +922,7 @@ static int __net_init genl_pernet_init(struct net *net)
922922
};
923923

924924
/* we'll bump the group number right afterwards */
925-
net->genl_sock = netlink_kernel_create(net, NETLINK_GENERIC,
926-
THIS_MODULE, &cfg);
925+
net->genl_sock = netlink_kernel_create(net, NETLINK_GENERIC, &cfg);
927926

928927
if (!net->genl_sock && net_eq(net, &init_net))
929928
panic("GENL: Cannot initialize generic netlink\n");

net/xfrm/xfrm_user.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2963,7 +2963,7 @@ static int __net_init xfrm_user_net_init(struct net *net)
29632963
.input = xfrm_netlink_rcv,
29642964
};
29652965

2966-
nlsk = netlink_kernel_create(net, NETLINK_XFRM, THIS_MODULE, &cfg);
2966+
nlsk = netlink_kernel_create(net, NETLINK_XFRM, &cfg);
29672967
if (nlsk == NULL)
29682968
return -ENOMEM;
29692969
net->xfrm.nlsk_stash = nlsk; /* Don't set to NULL */

security/selinux/netlink.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ static int __init selnl_init(void)
116116
.flags = NL_CFG_F_NONROOT_RECV,
117117
};
118118

119-
selnl = netlink_kernel_create(&init_net, NETLINK_SELINUX,
120-
THIS_MODULE, &cfg);
119+
selnl = netlink_kernel_create(&init_net, NETLINK_SELINUX, &cfg);
121120
if (selnl == NULL)
122121
panic("SELinux: Cannot create netlink socket.");
123122
return 0;

0 commit comments

Comments
 (0)