GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 00:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[NETLINK]: Add "groups" argument to netlink_kernel_create

Browse source 
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2005-08-15 12:33:26 -07:00 • committed by David S. Miller
parent 9a4595bc7e
commit 066286071d
16 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/w1/w1_int.c
View file

@ -88,7 +88,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
dev->groups = 1; dev->groups = 1;
dev->seq = 1; dev->seq = 1;
dev->nls = netlink_kernel_create(NETLINK_W1, NULL, THIS_MODULE); dev->nls = netlink_kernel_create(NETLINK_W1, 1, NULL, THIS_MODULE);
if (!dev->nls) { if (!dev->nls) {
printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n", printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n",
NETLINK_NFLOG, dev->dev.bus_id); NETLINK_NFLOG, dev->dev.bus_id);

2
include/linux/netlink.h
View file

@ -125,7 +125,7 @@ struct netlink_skb_parms
#define NETLINK_CREDS(skb) (&NETLINK_CB((skb)).creds) #define NETLINK_CREDS(skb) (&NETLINK_CB((skb)).creds)
extern struct sock *netlink_kernel_create(int unit, void (*input)(struct sock *sk, int len), struct module *module); extern struct sock *netlink_kernel_create(int unit, unsigned int groups, void (*input)(struct sock *sk, int len), struct module *module);
extern void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err); extern void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err);
extern int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 pid, int nonblock); extern int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 pid, int nonblock);
extern int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, __u32 pid, extern int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, __u32 pid,

2
kernel/audit.c
View file

@ -514,7 +514,7 @@ static int __init audit_init(void)
{ {
printk(KERN_INFO "audit: initializing netlink socket (%s)\n", printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
audit_default ? "enabled" : "disabled"); audit_default ? "enabled" : "disabled");
audit_sock = netlink_kernel_create(NETLINK_AUDIT, audit_receive, audit_sock = netlink_kernel_create(NETLINK_AUDIT, 0, audit_receive,
THIS_MODULE); THIS_MODULE);
if (!audit_sock) if (!audit_sock)
audit_panic("cannot initialize netlink socket"); audit_panic("cannot initialize netlink socket");

2
lib/kobject_uevent.c
View file

@ -154,7 +154,7 @@ EXPORT_SYMBOL_GPL(kobject_uevent_atomic);
static int __init kobject_uevent_init(void) static int __init kobject_uevent_init(void)
{ {
uevent_sock = netlink_kernel_create(NETLINK_KOBJECT_UEVENT, NULL, uevent_sock = netlink_kernel_create(NETLINK_KOBJECT_UEVENT, 1, NULL,
THIS_MODULE); THIS_MODULE);
if (!uevent_sock) { if (!uevent_sock) {

3
net/bridge/netfilter/ebt_ulog.c
View file

@ -258,7 +258,8 @@ static int __init init(void)
spin_lock_init(&ulog_buffers[i].lock); spin_lock_init(&ulog_buffers[i].lock);
} }
ebtulognl = netlink_kernel_create(NETLINK_NFLOG, NULL, THIS_MODULE); ebtulognl = netlink_kernel_create(NETLINK_NFLOG, EBT_ULOG_MAXNLGROUPS,
NULL, THIS_MODULE);
if (!ebtulognl) if (!ebtulognl)
ret = -ENOMEM; ret = -ENOMEM;
else if ((ret = ebt_register_watcher(&ulog))) else if ((ret = ebt_register_watcher(&ulog)))

3
net/core/rtnetlink.c
View file

@ -708,7 +708,8 @@ void __init rtnetlink_init(void)
if (!rta_buf) if (!rta_buf)
panic("rtnetlink_init: cannot allocate rta_buf\n"); panic("rtnetlink_init: cannot allocate rta_buf\n");
rtnl = netlink_kernel_create(NETLINK_ROUTE, rtnetlink_rcv, THIS_MODULE); rtnl = netlink_kernel_create(NETLINK_ROUTE, RTNLGRP_MAX, rtnetlink_rcv,
THIS_MODULE);
if (rtnl == NULL) if (rtnl == NULL)
panic("rtnetlink_init: cannot initialize rtnetlink\n"); panic("rtnetlink_init: cannot initialize rtnetlink\n");
netlink_set_nonroot(NETLINK_ROUTE, NL_NONROOT_RECV); netlink_set_nonroot(NETLINK_ROUTE, NL_NONROOT_RECV);

4
net/decnet/netfilter/dn_rtmsg.c
View file

@ -138,8 +138,8 @@ static int __init init(void)
{ {
int rv = 0; int rv = 0;
dnrmg = netlink_kernel_create(NETLINK_DNRTMSG, dnrmg_receive_user_sk, dnrmg = netlink_kernel_create(NETLINK_DNRTMSG, DNRNG_NLGRP_MAX,
THIS_MODULE); dnrmg_receive_user_sk, THIS_MODULE);
if (dnrmg == NULL) { if (dnrmg == NULL) {
printk(KERN_ERR "dn_rtmsg: Cannot create netlink socket"); printk(KERN_ERR "dn_rtmsg: Cannot create netlink socket");
return -ENOMEM; return -ENOMEM;

2
net/ipv4/fib_frontend.c
View file

@ -566,7 +566,7 @@ static void nl_fib_input(struct sock *sk, int len)
static void nl_fib_lookup_init(void) static void nl_fib_lookup_init(void)
{ {
netlink_kernel_create(NETLINK_FIB_LOOKUP, nl_fib_input, THIS_MODULE); netlink_kernel_create(NETLINK_FIB_LOOKUP, 0, nl_fib_input, THIS_MODULE);
} }
static void fib_disable_ip(struct net_device *dev, int force) static void fib_disable_ip(struct net_device *dev, int force)

2
net/ipv4/inet_diag.c
View file

@ -845,7 +845,7 @@ static int __init inet_diag_init(void)
goto out; goto out;
memset(inet_diag_table, 0, inet_diag_table_size); memset(inet_diag_table, 0, inet_diag_table_size);
idiagnl = netlink_kernel_create(NETLINK_INET_DIAG, inet_diag_rcv, idiagnl = netlink_kernel_create(NETLINK_INET_DIAG, 0, inet_diag_rcv,
THIS_MODULE); THIS_MODULE);
if (idiagnl == NULL) if (idiagnl == NULL)
goto out_free_table; goto out_free_table;

2
net/ipv4/netfilter/ip_queue.c
View file

@ -671,7 +671,7 @@ init_or_cleanup(int init)
goto cleanup; goto cleanup;
netlink_register_notifier(&ipq_nl_notifier); netlink_register_notifier(&ipq_nl_notifier);
ipqnl = netlink_kernel_create(NETLINK_FIREWALL, ipq_rcv_sk, ipqnl = netlink_kernel_create(NETLINK_FIREWALL, 0, ipq_rcv_sk,
THIS_MODULE); THIS_MODULE);
if (ipqnl == NULL) { if (ipqnl == NULL) {
printk(KERN_ERR "ip_queue: failed to create netlink socket\n"); printk(KERN_ERR "ip_queue: failed to create netlink socket\n");

3
net/ipv4/netfilter/ipt_ULOG.c
View file

@ -388,7 +388,8 @@ static int __init init(void)
ulog_buffers[i].timer.data = i; ulog_buffers[i].timer.data = i;
} }
nflognl = netlink_kernel_create(NETLINK_NFLOG, NULL, THIS_MODULE); nflognl = netlink_kernel_create(NETLINK_NFLOG, ULOG_MAXNLGROUPS, NULL,
THIS_MODULE);
if (!nflognl) if (!nflognl)
return -ENOMEM; return -ENOMEM;

3
net/ipv6/netfilter/ip6_queue.c
View file

@ -667,7 +667,8 @@ init_or_cleanup(int init)
goto cleanup; goto cleanup;
netlink_register_notifier(&ipq_nl_notifier); netlink_register_notifier(&ipq_nl_notifier);
ipqnl = netlink_kernel_create(NETLINK_IP6_FW, ipq_rcv_sk, THIS_MODULE); ipqnl = netlink_kernel_create(NETLINK_IP6_FW, 0, ipq_rcv_sk,
THIS_MODULE);
if (ipqnl == NULL) { if (ipqnl == NULL) {
printk(KERN_ERR "ip6_queue: failed to create netlink socket\n"); printk(KERN_ERR "ip6_queue: failed to create netlink socket\n");
goto cleanup_netlink_notifier; goto cleanup_netlink_notifier;

4
net/netfilter/nfnetlink.c
View file

@ -355,8 +355,8 @@ int __init nfnetlink_init(void)
{ {
printk("Netfilter messages via NETLINK v%s.\n", nfversion); printk("Netfilter messages via NETLINK v%s.\n", nfversion);
nfnl = netlink_kernel_create(NETLINK_NETFILTER, nfnetlink_rcv, nfnl = netlink_kernel_create(NETLINK_NETFILTER, NFNLGRP_MAX,
THIS_MODULE); nfnetlink_rcv, THIS_MODULE);
if (!nfnl) { if (!nfnl) {
printk(KERN_ERR "cannot initialize nfnetlink!\n"); printk(KERN_ERR "cannot initialize nfnetlink!\n");
return -1; return -1;

6
net/netlink/af_netlink.c
View file

@ -1204,7 +1204,9 @@ static void netlink_data_ready(struct sock *sk, int len)
*/ */
struct sock * struct sock *
netlink_kernel_create(int unit, void (*input)(struct sock *sk, int len), struct module *module) netlink_kernel_create(int unit, unsigned int groups,
void (*input)(struct sock *sk, int len),
struct module *module)
{ {
struct socket *sock; struct socket *sock;
struct sock *sk; struct sock *sk;
@ -1234,7 +1236,7 @@ netlink_kernel_create(int unit, void (*input)(struct sock *sk, int len), struct
nlk->flags |= NETLINK_KERNEL_SOCKET; nlk->flags |= NETLINK_KERNEL_SOCKET;
netlink_table_grab(); netlink_table_grab();
nl_table[unit].groups = 32; nl_table[unit].groups = groups < 32 ? 32 : groups;
nl_table[unit].module = module; nl_table[unit].module = module;
nl_table[unit].registered = 1; nl_table[unit].registered = 1;
netlink_table_ungrab(); netlink_table_ungrab();

4
net/xfrm/xfrm_user.c
View file

@ -1520,8 +1520,8 @@ static int __init xfrm_user_init(void)
{ {
printk(KERN_INFO "Initializing IPsec netlink socket\n"); printk(KERN_INFO "Initializing IPsec netlink socket\n");
xfrm_nl = netlink_kernel_create(NETLINK_XFRM, xfrm_netlink_rcv, xfrm_nl = netlink_kernel_create(NETLINK_XFRM, XFRMNLGRP_MAX,
THIS_MODULE); xfrm_netlink_rcv, THIS_MODULE);
if (xfrm_nl == NULL) if (xfrm_nl == NULL)
return -ENOMEM; return -ENOMEM;

3
security/selinux/netlink.c
View file

@ -104,7 +104,8 @@ void selnl_notify_policyload(u32 seqno)
static int __init selnl_init(void) static int __init selnl_init(void)
{ {
selnl = netlink_kernel_create(NETLINK_SELINUX, NULL, THIS_MODULE); selnl = netlink_kernel_create(NETLINK_SELINUX, SELNLGRP_MAX, NULL,
THIS_MODULE);
if (selnl == NULL) if (selnl == NULL)
panic("SELinux: Cannot create netlink socket."); panic("SELinux: Cannot create netlink socket.");
netlink_set_nonroot(NETLINK_SELINUX, NL_NONROOT_RECV); netlink_set_nonroot(NETLINK_SELINUX, NL_NONROOT_RECV);