Skip to content

Commit

Permalink
staging: octeon: use free_netdev(netdev) instead of kfree()
Browse files Browse the repository at this point in the history
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 <segooon@gmail.com>
Acked-by: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Vasiliy Kulikov authored and Greg Kroah-Hartman committed Sep 30, 2010
1 parent 8db3271 commit c4711c3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/octeon/ethernet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 -=
Expand Down Expand Up @@ -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;
}
}
Expand Down

0 comments on commit c4711c3

Please sign in to comment.