Skip to content

Commit

Permalink
l2tp_eth: fix memory allocation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Apr 23, 2010
1 parent e773aaf commit 3a73702
Showing 1 changed file with 1 addition and 28 deletions.
29 changes: 1 addition & 28 deletions net/l2tp/l2tp_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
struct l2tp_eth_net *pn;
int err;

pn = kzalloc(sizeof(*pn), GFP_KERNEL);
if (!pn)
return -ENOMEM;
struct l2tp_eth_net *pn = net_generic(net, l2tp_eth_net_id);

INIT_LIST_HEAD(&pn->l2tp_eth_dev_list);
spin_lock_init(&pn->l2tp_eth_lock);

err = net_assign_generic(net, l2tp_eth_net_id, pn);
if (err)
goto out;

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 = {
.init = l2tp_eth_init_net,
.exit = l2tp_eth_exit_net,
.id = &l2tp_eth_net_id,
.size = sizeof(struct l2tp_eth_net),
};
Expand Down

0 comments on commit 3a73702

Please sign in to comment.