Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

l2tp_eth: fix memory allocation

Browse source 
Since .size is set properly in "struct pernet_operations l2tp_eth_net_ops",
allocating space for "struct l2tp_eth_net" by hand is not correct, even causes
memory leakage.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2010-04-23 01:01:52 +00:00 committed by David S. Miller
parent e773aaff82
commit 3a73702863
1 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
net/l2tp/l2tp_eth.c
View file

@ -276,43 +276,16 @@ static int l2tp_eth_create(struct net *net, u32 tunnel_id, u32 session_id, u32 p
static __net_init int l2tp_eth_init_net(struct net *net) static __net_init int l2tp_eth_init_net(struct net *net)
{ {
struct l2tp_eth_net *pn; struct l2tp_eth_net *pn = net_generic(net, l2tp_eth_net_id);
int err;
pn = kzalloc(sizeof(*pn), GFP_KERNEL);
if (!pn)
return -ENOMEM;
INIT_LIST_HEAD(&pn->l2tp_eth_dev_list); INIT_LIST_HEAD(&pn->l2tp_eth_dev_list);
spin_lock_init(&pn->l2tp_eth_lock); spin_lock_init(&pn->l2tp_eth_lock);
err = net_assign_generic(net, l2tp_eth_net_id, pn);
if (err)
goto out;
return 0; return 0;
out:
kfree(pn);
return err;
}
static __net_exit void l2tp_eth_exit_net(struct net *net)
{
struct l2tp_eth_net *pn;
pn = net_generic(net, l2tp_eth_net_id);
/*
* if someone has cached our net then
* further net_generic call will return NULL
*/
net_assign_generic(net, l2tp_eth_net_id, NULL);
kfree(pn);
} }
static __net_initdata struct pernet_operations l2tp_eth_net_ops = { static __net_initdata struct pernet_operations l2tp_eth_net_ops = {
.init = l2tp_eth_init_net, .init = l2tp_eth_init_net,
.exit = l2tp_eth_exit_net,
.id = &l2tp_eth_net_id, .id = &l2tp_eth_net_id,
.size = sizeof(struct l2tp_eth_net), .size = sizeof(struct l2tp_eth_net),
}; };