From: Vasiliy Kulikov Date: Tue, 28 Sep 2010 17:08:01 +0000 (+0400) Subject: staging: octeon: use free_netdev(netdev) instead of kfree() X-Git-Tag: v2.6.37-rc1~60^2~3^2~444 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=c4711c3acb9fbe7f559ead7ff511dba3665a048e;p=net-next-2.6.git staging: octeon: use free_netdev(netdev) instead of kfree() It is not guaranteed that free_netdev() is macro. Freeing netdev without free_netdev() leads to net, tx leaks. I might lead to dereferencing freed pointer. Signed-off-by: Vasiliy Kulikov Acked-by: David Daney Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index fb568a935ee..a8f780e95e0 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -670,7 +670,7 @@ static int __init cvm_oct_init_module(void) if (register_netdev(dev) < 0) { pr_err("Failed to register ethernet device for POW\n"); - kfree(dev); + free_netdev(dev); } else { cvm_oct_device[CVMX_PIP_NUM_INPUT_PORTS] = dev; pr_info("%s: POW send group %d, receive group %d\n", @@ -756,12 +756,12 @@ static int __init cvm_oct_init_module(void) } if (!dev->netdev_ops) { - kfree(dev); + free_netdev(dev); } else if (register_netdev(dev) < 0) { pr_err("Failed to register ethernet device " "for interface %d, port %d\n", interface, priv->port); - kfree(dev); + free_netdev(dev); } else { cvm_oct_device[priv->port] = dev; fau -= @@ -815,7 +815,7 @@ static void __exit cvm_oct_cleanup_module(void) cvm_oct_tx_shutdown_dev(dev); unregister_netdev(dev); - kfree(dev); + free_netdev(dev); cvm_oct_device[port] = NULL; } }