l2tp_eth: fix memory allocation
Jiri Pirko [Fri, 23 Apr 2010 01:01:52 +0000 (01:01 +0000)]
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>

net/l2tp/l2tp_eth.c

index ca1164a..58c6c4c 100644 (file)
@@ -276,43 +276,16 @@ out:
 
 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),
 };