Skip to contentSkip to conversation

scsi: mpi3mr: fix possible crash when setup bsg fail

PATCH Superseded Guixin Liu 2 participants 4 messages Dec 17, 2024 – Dec 26, 2024

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Guixin Liu

author
#0 lore raw

PATCH v2 1/1 scsi: mpi3mr: fix possible crash when setup bsg fail

If bsg_setup_queue() fails, the bsg_queue is assigned a non-NULL value. Consequently, in mpi3mr_bsg_exit(), the condition "if(!mrioc->bsg_queue)" will not be satisfied, preventing execution from entering bsg_remove_queue(), which could lead to a crash.

Fixes 4268fa751365 ("scsi: mpi3mr: Add bsg device support")

---
Changes from v1 to v2:
- Add return statement when setup bsg queue fail, sorry for the v1 trouble.

 drivers/scsi/mpi3mr/mpi3mr_app.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/scsi/mpi3mr/mpi3mr_app.c +6 -2
index 10b8e4dc64f8..7589f48aebc8 100644
@@ -2951,6 +2951,7 @@ void mpi3mr_bsg_init(struct mpi3mr_ioc *mrioc)
 		.max_hw_sectors		= MPI3MR_MAX_APP_XFER_SECTORS,
 		.max_segments		= MPI3MR_MAX_APP_XFER_SEGMENTS,
 	};
+	struct request_queue *q;
 
 	device_initialize(bsg_dev);
 
@@ -2966,14 +2967,17 @@ void mpi3mr_bsg_init(struct mpi3mr_ioc *mrioc)
 		return;
 	}
 
-	mrioc->bsg_queue = bsg_setup_queue(bsg_dev, dev_name(bsg_dev), &lim,
+	q = bsg_setup_queue(bsg_dev, dev_name(bsg_dev), &lim,
 			mpi3mr_bsg_request, NULL, 0);
-	if (IS_ERR(mrioc->bsg_queue)) {
+	if (IS_ERR(q)) {
 		ioc_err(mrioc, "%s: bsg registration failed\n",
 		    dev_name(bsg_dev));
 		device_del(bsg_dev);
 		put_device(bsg_dev);
+		return;
 	}
+
+	mrioc->bsg_queue = q;
 }
 
 /**
Signature · 1 line
2.43.0
author
#1 lore raw

Gentle ping...

Best Regards,

Guixin Liu

Quoted 46 lines · Guixin Liu

If bsg_setup_queue() fails, the bsg_queue is assigned a non-NULL value. Consequently, in mpi3mr_bsg_exit(), the condition "if(!mrioc->bsg_queue)" will not be satisfied, preventing execution from entering bsg_remove_queue(), which could lead to a crash.

Fixes 4268fa751365 ("scsi: mpi3mr: Add bsg device support")

---
Changes from v1 to v2:
- Add return statement when setup bsg queue fail, sorry for the v1 trouble.

  drivers/scsi/mpi3mr/mpi3mr_app.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
drivers/scsi/mpi3mr/mpi3mr_app.c +6 -2
index 10b8e4dc64f8..7589f48aebc8 100644
@@ -2951,6 +2951,7 @@ void mpi3mr_bsg_init(struct mpi3mr_ioc *mrioc)
  		.max_hw_sectors		= MPI3MR_MAX_APP_XFER_SECTORS,
  		.max_segments		= MPI3MR_MAX_APP_XFER_SEGMENTS,
  	};
+	struct request_queue *q;
 
  	device_initialize(bsg_dev);
 
@@ -2966,14 +2967,17 @@ void mpi3mr_bsg_init(struct mpi3mr_ioc *mrioc)
  		return;
  	}
 
-	mrioc->bsg_queue = bsg_setup_queue(bsg_dev, dev_name(bsg_dev), &lim,
+	q = bsg_setup_queue(bsg_dev, dev_name(bsg_dev), &lim,
  			mpi3mr_bsg_request, NULL, 0);
-	if (IS_ERR(mrioc->bsg_queue)) {
+	if (IS_ERR(q)) {
  		ioc_err(mrioc, "%s: bsg registration failed\n",
  		    dev_name(bsg_dev));
  		device_del(bsg_dev);
  		put_device(bsg_dev);
+		return;
  	}
+
+	mrioc->bsg_queue = q;
  }
 
  /**
#2 lore raw
Quoted 1 line · Guixin Liu

Gentle ping...

Has this patch been tested?

Bart.

author
#3 lore raw
Quoted 6 lines · Bart Van Assche
Quoted 1 line · Guixin Liu

Gentle ping...

Has this patch been tested?

Bart.

Yes, I will send a v3 patch with the crash stack,

Best Regards,

Guixin Liu