Skip to contentSkip to conversation

drivers/net/wimax/i2400m/fw.c fix possible double free

PATCH In review Darren Jenkins 3 participants 3 messages Mar 16, 2010 – Mar 17, 2010

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

PATCH 1/1 drivers/net/wimax/i2400m/fw.c fix possible double free

i2400m_fw_check() can free i2400m->fw_hdrs if krealloc() fails causing a double free Add a check so we don't free the memory a second time.

coverity CID: 13455

---
 drivers/net/wimax/i2400m/fw.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/wimax/i2400m/fw.c +2 -1
index 25c24f0..a97c413 100644
@@ -1490,7 +1490,8 @@ int i2400m_fw_bootstrap(struct i2400m *i2400m, const struct firmware *fw,
 	if (ret < 0)
 		dev_err(dev, "%s: cannot use: %d, skipping\n",
 			i2400m->fw_name, ret);
-	kfree(i2400m->fw_hdrs);
+	if (ret != -ENOMEM)
+		kfree(i2400m->fw_hdrs);
 	i2400m->fw_hdrs = NULL;
 	d_fnend(5, dev, "(i2400m %p) = %d\n", i2400m, ret);
 	return ret;
Signature · 1 line
1.6.3.3
maintainer
#1 lore raw

From: Darren Jenkins <[email protected]>
Date: Tue, 16 Mar 2010 22:46:28 +1100

Quoted 6 lines

i2400m_fw_check() can free i2400m->fw_hdrs if krealloc() fails causing a double free Add a check so we don't free the memory a second time.

coverity CID: 13455

Please don't fix it like this, the check is obscure and it's allowing other bugs to happen.

If krealloc() fails, any refrence to i2400m->fw_hdrs is referencing freed memory.

Therefore the krealloc() failure handling in this driver should NULL out i2400m->fw_hdrs and that will fix the double kfree problem as well as trap any stray references.

Quoted 20 lines
---
 drivers/net/wimax/i2400m/fw.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/wimax/i2400m/fw.c +2 -1
index 25c24f0..a97c413 100644
@@ -1490,7 +1490,8 @@ int i2400m_fw_bootstrap(struct i2400m *i2400m, const struct firmware *fw,
 	if (ret < 0)
 		dev_err(dev, "%s: cannot use: %d, skipping\n",
 			i2400m->fw_name, ret);
-	kfree(i2400m->fw_hdrs);
+	if (ret != -ENOMEM)
+		kfree(i2400m->fw_hdrs);
 	i2400m->fw_hdrs = NULL;
 	d_fnend(5, dev, "(i2400m %p) = %d\n", i2400m, ret);
 	return ret;
Signature · 1 line
1.6.3.3
#2 lore raw
Quoted 13 lines · David Miller

From: Darren Jenkins <[email protected]>
Date: Tue, 16 Mar 2010 22:46:28 +1100

Quoted 6 lines

i2400m_fw_check() can free i2400m->fw_hdrs if krealloc() fails causing a double free Add a check so we don't free the memory a second time.

coverity CID: 13455

Please don't fix it like this, the check is obscure and it's allowing other bugs to happen.

Quoted 6 lines

If krealloc() fails, any refrence to i2400m->fw_hdrs is referencing freed memory.

Therefore the krealloc() failure handling in this driver should NULL out i2400m->fw_hdrs and that will fix the double kfree problem as well as trap any stray references.

I agree with David, the fix is quite obscure. The error path in i2400m_fw_check()'s call to i2400m_kzrealloc_2x() should be rather cleaning up in a better way.