[PATCH] scsi: megaraid_mbox: avoid double kfree()

Arnd Bergmann posted 1 patch 6 days, 7 hours ago
drivers/scsi/megaraid/megaraid_mm.c | 2 --
1 file changed, 2 deletions(-)
[PATCH] scsi: megaraid_mbox: avoid double kfree()
Posted by Arnd Bergmann 6 days, 7 hours ago
From: Arnd Bergmann <arnd@arndb.de>

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()")
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/scsi/megaraid/megaraid_mm.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index 60db48dc8f3a..e572665903d2 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -998,8 +998,6 @@ mraid_mm_register_adp(mraid_mmadp_t *adapter)
 
 	dma_pool_destroy(adapter->pthru_dma_pool);
 
-	kfree(adapter);
-
 	return rval;
 }
 
-- 
2.39.5
Re: [PATCH] scsi: megaraid_mbox: avoid double kfree()
Posted by Martin K. Petersen 6 days, 2 hours ago
Arnd,

> 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!

-- 
Martin K. Petersen