Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4711c3a authored by Vasiliy Kulikov's avatar Vasiliy Kulikov Committed by Greg Kroah-Hartman
Browse files

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: default avatarVasiliy Kulikov <segooon@gmail.com>
Acked-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8db3271c

drivers/staging/octeon/ethernet.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

		}

	}