Skip to contentSkip to conversation

scsi: megaraid_mbox: avoid double kfree()

PATCH Applied Arnd Bergmann 2 participants 3 messages Jun 1 – Jun 9

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

PATCH 1/1 scsi: megaraid_mbox: avoid double kfree()

From: Arnd Bergmann <[email protected]>

Smatch found a double-free after my recent change:

drivers/scsi/megaraid/megaraid_mbox.c:3474 megaraid_cmm_register()
error: double free of 'adp' (line 3468)

Since the object is no longer allocated in megaraid_cmm_register(), remove the kfree() as well.

Fixes c1f7275b613b ("scsi: megaraid_mbox: Reduce stack usage in megaraid_cmm_register()")
---
 drivers/scsi/megaraid/megaraid_mm.c | 2 --
 1 file changed, 2 deletions(-)
drivers/scsi/megaraid/megaraid_mm.c +0 -2
index 60db48dc8f3a..e572665903d2 100644
@@ -998,8 +998,6 @@ mraid_mm_register_adp(mraid_mmadp_t *adapter)
 
 	dma_pool_destroy(adapter->pthru_dma_pool);
 
-	kfree(adapter);
-
 	return rval;
 }
 
Signature · 1 line
2.39.5
#1 lore raw

Arnd,

Quoted 7 lines

Smatch found a double-free after my recent change:

drivers/scsi/megaraid/megaraid_mbox.c:3474 megaraid_cmm_register()
error: double free of 'adp' (line 3468)

Since the object is no longer allocated in megaraid_cmm_register(), remove the kfree() as well.

Applied to 7.2/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen
#2 lore raw
In reply to Arnd Bergmann
Quoted 9 lines · Arnd Bergmann

Smatch found a double-free after my recent change:

drivers/scsi/megaraid/megaraid_mbox.c:3474 megaraid_cmm_register()
error: double free of 'adp' (line 3468)

Since the object is no longer allocated in megaraid_cmm_register(), remove the kfree() as well.

[...]

Applied to 7.2/scsi-queue, thanks!

[1/1] scsi: megaraid_mbox: avoid double kfree()

      https://git.kernel.org/mkp/scsi/c/c39a9a02bc5d
Signature · 1 line
Martin K. Petersen