Skip to contentSkip to conversation

Staging: vt6655-6: potential NULL dereference in hostap_disable_hostapd()

PATCH In review Dan Carpenter 3 participants 4 messages Nov 7, 2013 – Jan 15, 2014

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

PATCH 1/1 Staging: vt6655-6: potential NULL dereference in hostap_disable_hostapd()

We fixed this to use free_netdev() instead of kfree() but unfortunately free_netdev() doesn't accept NULL pointers. Smatch complains about this, it's not something I discovered through testing.

Fixes 3030d40b5036 ('staging: vt6655: use free_netdev instead of kfree')
Fixes 0a438d5b381e ('staging: vt6656: use free_netdev instead of kfree')
drivers/staging/vt6655/hostap.c +2 -1
index aab0012..ab8b2ba 100644
@@ -143,7 +143,8 @@ static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked)
 		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n",
 			pDevice->dev->name, pDevice->apdev->name);
 	}
-	free_netdev(pDevice->apdev);
+	if (pDevice->apdev)
+		free_netdev(pDevice->apdev);
 	pDevice->apdev = NULL;
 	pDevice->bEnable8021x = false;
 	pDevice->bEnableHostWEP = false;
drivers/staging/vt6656/hostap.c +2 -1
index ae1676d..67ba48b 100644
@@ -133,7 +133,8 @@ static int hostap_disable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n",
 		       pDevice->dev->name, pDevice->apdev->name);
 	}
-	free_netdev(pDevice->apdev);
+	if (pDevice->apdev)
+		free_netdev(pDevice->apdev);
 	pDevice->apdev = NULL;
     pDevice->bEnable8021x = false;
     pDevice->bEnableHostWEP = false;
#1 lore raw

T24gVGh1LCAyMDEzLTExLTA3IGF0IDEwOjU1ICswMzAwLCBEYW4gQ2FycGVudGVyIHdyb3RlOg0K PiBXZSBmaXhlZCB0aGlzIHRvIHVzZSBmcmVlX25ldGRldigpIGluc3RlYWQgb2Yga2ZyZWUoKSBi dXQgdW5mb3J0dW5hdGVseQ0KPiBmcmVlX25ldGRldigpIGRvZXNuJ3QgYWNjZXB0IE5VTEwgcG9p bnRlcnMuICBTbWF0Y2ggY29tcGxhaW5zIGFib3V0DQo+IHRoaXMsIGl0J3Mgbm90IHNvbWV0aGlu ZyBJIGRpc2NvdmVyZWQgdGhyb3VnaCB0ZXN0aW5nLg0KDQpXb3VsZG4ndCBhIGJldHRlciBhcHBy b2FjaCBiZSB0byBjaGFuZ2UgZnJlZV9uZXRkZXYoKSB0byBhbGxvdyBpdCB0bw0KdGFrZSBOVUxM IHBvaW50ZXJzPw0KDQotUEoNCg0KPiBGaXhlczogMzAzMGQ0MGI1MDM2ICgnc3RhZ2luZzogdnQ2 NjU1OiB1c2UgZnJlZV9uZXRkZXYgaW5zdGVhZCBvZiBrZnJlZScpDQo+IEZpeGVzOiAwYTQzOGQ1 YjM4MWUgKCdzdGFnaW5nOiB2dDY2NTY6IHVzZSBmcmVlX25ldGRldiBpbnN0ZWFkIG9mIGtmcmVl JykNCj4gU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUu Y29tPg0KPiANCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy92dDY2NTUvaG9zdGFwLmMg Yi9kcml2ZXJzL3N0YWdpbmcvdnQ2NjU1L2hvc3RhcC5jDQo+IGluZGV4IGFhYjAwMTIuLmFiOGIy YmEgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvc3RhZ2luZy92dDY2NTUvaG9zdGFwLmMNCj4gKysr IGIvZHJpdmVycy9zdGFnaW5nL3Z0NjY1NS9ob3N0YXAuYw0KPiBAQCAtMTQzLDcgKzE0Myw4IEBA IHN0YXRpYyBpbnQgaG9zdGFwX2Rpc2FibGVfaG9zdGFwZChQU0RldmljZSBwRGV2aWNlLCBpbnQg cnRubF9sb2NrZWQpDQo+ICAJCURCR19QUlQoTVNHX0xFVkVMX0RFQlVHLCBLRVJOX0lORk8gIiVz OiBOZXRkZXZpY2UgJXMgdW5yZWdpc3RlcmVkXG4iLA0KPiAgCQkJcERldmljZS0+ZGV2LT5uYW1l LCBwRGV2aWNlLT5hcGRldi0+bmFtZSk7DQo+ICAJfQ0KPiAtCWZyZWVfbmV0ZGV2KHBEZXZpY2Ut PmFwZGV2KTsNCj4gKwlpZiAocERldmljZS0+YXBkZXYpDQo+ICsJCWZyZWVfbmV0ZGV2KHBEZXZp Y2UtPmFwZGV2KTsNCj4gIAlwRGV2aWNlLT5hcGRldiA9IE5VTEw7DQo+ICAJcERldmljZS0+YkVu YWJsZTgwMjF4ID0gZmFsc2U7DQo+ICAJcERldmljZS0+YkVuYWJsZUhvc3RXRVAgPSBmYWxzZTsN Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy92dDY2NTYvaG9zdGFwLmMgYi9kcml2ZXJz L3N0YWdpbmcvdnQ2NjU2L2hvc3RhcC5jDQo+IGluZGV4IGFlMTY3NmQuLjY3YmE0OGIgMTAwNjQ0 DQo+IC0tLSBhL2RyaXZlcnMvc3RhZ2luZy92dDY2NTYvaG9zdGFwLmMNCj4gKysrIGIvZHJpdmVy cy9zdGFnaW5nL3Z0NjY1Ni9ob3N0YXAuYw0KPiBAQCAtMTMzLDcgKzEzMyw4IEBAIHN0YXRpYyBp bnQgaG9zdGFwX2Rpc2FibGVfaG9zdGFwZChzdHJ1Y3Qgdm50X3ByaXZhdGUgKnBEZXZpY2UsIGlu dCBydG5sX2xvY2tlZCkNCj4gICAgICAgICAgICAgIERCR19QUlQoTVNHX0xFVkVMX0RFQlVHLCBL RVJOX0lORk8gIiVzOiBOZXRkZXZpY2UgJXMgdW5yZWdpc3RlcmVkXG4iLA0KPiAgCQkgICAgICAg cERldmljZS0+ZGV2LT5uYW1lLCBwRGV2aWNlLT5hcGRldi0+bmFtZSk7DQo+ICAJfQ0KPiAtCWZy ZWVfbmV0ZGV2KHBEZXZpY2UtPmFwZGV2KTsNCj4gKwlpZiAocERldmljZS0+YXBkZXYpDQo+ICsJ CWZyZWVfbmV0ZGV2KHBEZXZpY2UtPmFwZGV2KTsNCj4gIAlwRGV2aWNlLT5hcGRldiA9IE5VTEw7 DQo+ICAgICAgcERldmljZS0+YkVuYWJsZTgwMjF4ID0gZmFsc2U7DQo+ICAgICAgcERldmljZS0+ YkVuYWJsZUhvc3RXRVAgPSBmYWxzZTsNCg0K

#2 lore raw
In reply to Dan Carpenter

Am 07.11.2013 08:55, schrieb Dan Carpenter:

Quoted 13 lines

We fixed this to use free_netdev() instead of kfree() but unfortunately free_netdev() doesn't accept NULL pointers. Smatch complains about this, it's not something I discovered through testing.

Fixes 3030d40b5036 ('staging: vt6655: use free_netdev instead of kfree')
Fixes 0a438d5b381e ('staging: vt6656: use free_netdev instead of kfree')
drivers/staging/vt6655/hostap.c +0 -0
index aab0012..ab8b2ba 100644

drivers/staging/vt6655/hostap.c static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked) · line 147

Quoted 6 lines
drivers/staging/vt6655/hostap.c +2 -1
@@ -143,7 +143,8 @@ static int hostap_disable_hostapd(PSDevice pDevice, int rtnl_locked)
 		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n",
 			pDevice->dev->name, pDevice->apdev->name);
 	}
-	free_netdev(pDevice->apdev);
+	if (pDevice->apdev)
+		free_netdev(pDevice->apdev);

perhaps the better way is to fix free_netdev() to make it behave like kfree() and friends.

just my 2 cents,
wh

Quoted 22 lines
drivers/staging/vt6655/hostap.c +0 -0
 	pDevice->apdev = NULL;
 	pDevice->bEnable8021x = false;
 	pDevice->bEnableHostWEP = false;
drivers/staging/vt6656/hostap.c +2 -2
index ae1676d..67ba48b 100644
@@ -133,7 +133,8 @@ static int hostap_disable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Netdevice %s unregistered\n",
 		       pDevice->dev->name, pDevice->apdev->name);
 	}
-	free_netdev(pDevice->apdev);
+	if (pDevice->apdev)
+		free_netdev(pDevice->apdev);
 	pDevice->apdev = NULL;
     pDevice->bEnable8021x = false;
     pDevice->bEnableHostWEP = false;
--

To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html