Skip to contentSkip to conversation

staging: octeon: use free_netdev(netdev) instead of kfree()

PATCH In review Vasiliy Kulikov 2 participants 2 messages Sep 28, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 6/9 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.

---
 drivers/staging/octeon/ethernet.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/octeon/ethernet.c +3 -3
index fb568a9..a8f780e 100644
@@ -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;
}
}

Signature · 1 line
1.7.0.4
Acked-by on v1 6/9
#1 lore raw
Quoted 6 lines · Vasiliy Kulikov

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.

Thanks, you can add:

Quoted 40 lines
---
  drivers/staging/octeon/ethernet.c |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/octeon/ethernet.c +3 -3
index fb568a9..a8f780e 100644
@@ -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);
drivers/staging/octeon/ethernet.c +1 -1
-			kfree(dev);
+			free_netdev(dev);
  			cvm_oct_device[port] = NULL;
  		}
  	}