Commit e773aaff authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

l2tp: fix memory allocation

Since .size is set properly in "struct pernet_operations l2tp_net_ops",
allocating space for "struct l2tp_net" by hand is not correct, even causes
memory leakage.
Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b51cc99
...@@ -1617,14 +1617,9 @@ EXPORT_SYMBOL_GPL(l2tp_session_create); ...@@ -1617,14 +1617,9 @@ EXPORT_SYMBOL_GPL(l2tp_session_create);
static __net_init int l2tp_init_net(struct net *net) static __net_init int l2tp_init_net(struct net *net)
{ {
struct l2tp_net *pn; struct l2tp_net *pn = net_generic(net, l2tp_net_id);
int err;
int hash; int hash;
pn = kzalloc(sizeof(*pn), GFP_KERNEL);
if (!pn)
return -ENOMEM;
INIT_LIST_HEAD(&pn->l2tp_tunnel_list); INIT_LIST_HEAD(&pn->l2tp_tunnel_list);
spin_lock_init(&pn->l2tp_tunnel_list_lock); spin_lock_init(&pn->l2tp_tunnel_list_lock);
...@@ -1633,33 +1628,11 @@ static __net_init int l2tp_init_net(struct net *net) ...@@ -1633,33 +1628,11 @@ static __net_init int l2tp_init_net(struct net *net)
spin_lock_init(&pn->l2tp_session_hlist_lock); spin_lock_init(&pn->l2tp_session_hlist_lock);
err = net_assign_generic(net, l2tp_net_id, pn);
if (err)
goto out;
return 0; return 0;
out:
kfree(pn);
return err;
}
static __net_exit void l2tp_exit_net(struct net *net)
{
struct l2tp_net *pn;
pn = net_generic(net, l2tp_net_id);
/*
* if someone has cached our net then
* further net_generic call will return NULL
*/
net_assign_generic(net, l2tp_net_id, NULL);
kfree(pn);
} }
static struct pernet_operations l2tp_net_ops = { static struct pernet_operations l2tp_net_ops = {
.init = l2tp_init_net, .init = l2tp_init_net,
.exit = l2tp_exit_net,
.id = &l2tp_net_id, .id = &l2tp_net_id,
.size = sizeof(struct l2tp_net), .size = sizeof(struct l2tp_net),
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment