iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netlink: Make NETLINK_USERSOCK work again.

Browse Source 
Once we started enforcing the a nl_table[] entry exist for
a protocol, NETLINK_USERSOCK stopped working.  Add a dummy
table entry so that it works again.

Reported-by: Thomas Voegtle <tv@lio96.de>
Tested-by: Thomas Voegtle <tv@lio96.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2010-08-30 19:08:01 -07:00
parent 628e300ccc
commit b963ea89f0
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/netlink/af_netlink.c
View File

@ -2102,6 +2102,26 @@ static void __net_exit netlink_net_exit(struct net *net)
#endif #endif
} }
static void __init netlink_add_usersock_entry(void)
{
unsigned long *listeners;
int groups = 32;
listeners = kzalloc(NLGRPSZ(groups) + sizeof(struct listeners_rcu_head),
GFP_KERNEL);
if (!listeners)
panic("netlink_add_usersock_entry: Cannot allocate listneres\n");
netlink_table_grab();
nl_table[NETLINK_USERSOCK].groups = groups;
nl_table[NETLINK_USERSOCK].listeners = listeners;
nl_table[NETLINK_USERSOCK].module = THIS_MODULE;
nl_table[NETLINK_USERSOCK].registered = 1;
netlink_table_ungrab();
}
static struct pernet_operations __net_initdata netlink_net_ops = { static struct pernet_operations __net_initdata netlink_net_ops = {
.init = netlink_net_init, .init = netlink_net_init,
.exit = netlink_net_exit, .exit = netlink_net_exit,
@ -2150,6 +2170,8 @@ static int __init netlink_proto_init(void)
hash->rehash_time = jiffies; hash->rehash_time = jiffies;
} }
netlink_add_usersock_entry();
sock_register(&netlink_family_ops); sock_register(&netlink_family_ops);
register_pernet_subsys(&netlink_net_ops); register_pernet_subsys(&netlink_net_ops);
/* The netlink device handler may be needed early. */ /* The netlink device handler may be needed early. */