Skip to contentSkip to conversation

mpi3mr: fix a double free

PATCH Applied Tomas Henzl 3 participants 4 messages Jun 8, 2021 – Jun 16, 2021

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

PATCH v2 1/1 mpi3mr: fix a double free

Fix a double free, scsi_tgt_priv_data will be freed in mpi3mr_target_destroy so remove the kfree from mpi3mr_target_alloc.
I've also removed few unneeded initialisations.

---
V2: removed init of scsi_tgt_priv_data->starget = starget and scsi_tgt_priv_data->dev_handle = MPI3MR_INVALID_DEV_HANDLE suggested by Kashyap

 drivers/scsi/mpi3mr/mpi3mr_os.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/scsi/mpi3mr/mpi3mr_os.c +1 -6
index a54aa009ec5a..29d43235b525 100644
@@ -3294,13 +3294,10 @@ static int mpi3mr_target_alloc(struct scsi_target *starget)
 		return -ENOMEM;
 
 	starget->hostdata = scsi_tgt_priv_data;
-	scsi_tgt_priv_data->starget = starget;
-	scsi_tgt_priv_data->dev_handle = MPI3MR_INVALID_DEV_HANDLE;
 
 	spin_lock_irqsave(&mrioc->tgtdev_lock, flags);
 	tgt_dev = __mpi3mr_get_tgtdev_by_perst_id(mrioc, starget->id);
 	if (tgt_dev && !tgt_dev->is_hidden) {
-		starget->hostdata = scsi_tgt_priv_data;
 		scsi_tgt_priv_data->starget = starget;
 		scsi_tgt_priv_data->dev_handle = tgt_dev->dev_handle;
 		scsi_tgt_priv_data->perst_id = tgt_dev->perst_id;
@@ -3309,10 +3306,8 @@ static int mpi3mr_target_alloc(struct scsi_target *starget)
 		tgt_dev->starget = starget;
 		atomic_set(&scsi_tgt_priv_data->block_io, 0);
 		retval = 0;
-	} else {
-		kfree(scsi_tgt_priv_data);
+	} else
 		retval = -ENXIO;
-	}
 	spin_unlock_irqrestore(&mrioc->tgtdev_lock, flags);
 
 	return retval;
Signature · 1 line
2.31.1
maintainer Acked-by on v2 1/1
#1 lore raw
Quoted 2 lines

Fix a double free, scsi_tgt_priv_data will be freed in

mpi3mr_target_destroy

drivers/scsi/mpi3mr/mpi3mr_os.c static int mpi3mr_target_alloc(struct

Quoted 19 lines

so remove the kfree from mpi3mr_target_alloc.
I've also removed few unneeded initialisations.

---
V2: removed init of scsi_tgt_priv_data->starget = starget and scsi_tgt_priv_data->dev_handle = MPI3MR_INVALID_DEV_HANDLE suggested by Kashyap

 drivers/scsi/mpi3mr/mpi3mr_os.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
(quoted diff) +0 -0

b/drivers/scsi/mpi3mr/mpi3mr_os.c index a54aa009ec5a..29d43235b525 100644

drivers/scsi/mpi3mr/mpi3mr_os.c +0 -0
@@ -3294,13 +3294,10 @@ static int mpi3mr_target_alloc(struct

scsi_target

Quoted 17 lines
drivers/scsi/mpi3mr/mpi3mr_os.c +0 -3
 *starget)
 		return -ENOMEM;
 
 	starget->hostdata = scsi_tgt_priv_data;
-	scsi_tgt_priv_data->starget = starget;
-	scsi_tgt_priv_data->dev_handle = MPI3MR_INVALID_DEV_HANDLE;
 
 	spin_lock_irqsave(&mrioc->tgtdev_lock, flags);
 	tgt_dev = __mpi3mr_get_tgtdev_by_perst_id(mrioc, starget->id);
 	if (tgt_dev && !tgt_dev->is_hidden) {
-		starget->hostdata = scsi_tgt_priv_data;
 		scsi_tgt_priv_data->starget = starget;
 		scsi_tgt_priv_data->dev_handle = tgt_dev->dev_handle;

scsi_tgt_priv_data->perst_id = tgt_dev->perst_id; @@ -
3309,10 +3306,8 @@ static int mpi3mr_target_alloc(struct scsi_target *starget)

drivers/scsi/mpi3mr/mpi3mr_os.c +0 -0
 		tgt_dev->starget = starget;

drivers/scsi/mpi3mr/mpi3mr_os.c static int mpi3mr_target_alloc(struct scsi_target *starget) · line 3313

Quoted 10 lines
drivers/scsi/mpi3mr/mpi3mr_os.c +1 -3
 		atomic_set(&scsi_tgt_priv_data->block_io, 0);
 		retval = 0;
-	} else {
-		kfree(scsi_tgt_priv_data);
+	} else
 		retval = -ENXIO;
-	}
 	spin_unlock_irqrestore(&mrioc->tgtdev_lock, flags);
 
 	return retval;
#2 lore raw
In reply to Tomas Henzl

Tomas,

Quoted 3 lines

Fix a double free, scsi_tgt_priv_data will be freed in mpi3mr_target_destroy so remove the kfree from mpi3mr_target_alloc. I've also removed few unneeded initialisations.

Applied to 5.14/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering