* [PATCH v2] scsi: mpi3mr: fix possible crash when setup bsg fail
@ 2024-12-17 11:04 Guixin Liu
2024-12-20 1:37 ` Guixin Liu
0 siblings, 1 reply; 4+ messages in thread
From: Guixin Liu @ 2024-12-17 11:04 UTC (permalink / raw)
To: Sathya Prakash Veerichetty, Kashyap Desai, Sumit Saxena,
Sreekanth Reddy, James E . J . Bottomley, Martin K . Petersen
Cc: mpi3mr-linuxdrv.pdl, linux-scsi
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")
Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
---
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(-)
diff --git a/drivers/scsi/mpi3mr/mpi3mr_app.c b/drivers/scsi/mpi3mr/mpi3mr_app.c
index 10b8e4dc64f8..7589f48aebc8 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_app.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_app.c
@@ -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.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] scsi: mpi3mr: fix possible crash when setup bsg fail
2024-12-17 11:04 [PATCH v2] scsi: mpi3mr: fix possible crash when setup bsg fail Guixin Liu
@ 2024-12-20 1:37 ` Guixin Liu
2024-12-20 17:19 ` Bart Van Assche
0 siblings, 1 reply; 4+ messages in thread
From: Guixin Liu @ 2024-12-20 1:37 UTC (permalink / raw)
To: Sathya Prakash Veerichetty, Kashyap Desai, Sumit Saxena,
Sreekanth Reddy, James E . J . Bottomley, Martin K . Petersen
Cc: mpi3mr-linuxdrv.pdl, linux-scsi
Gentle ping...
Best Regards,
Guixin Liu
在 2024/12/17 19:04, 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")
> Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
> ---
> 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(-)
>
> diff --git a/drivers/scsi/mpi3mr/mpi3mr_app.c b/drivers/scsi/mpi3mr/mpi3mr_app.c
> index 10b8e4dc64f8..7589f48aebc8 100644
> --- a/drivers/scsi/mpi3mr/mpi3mr_app.c
> +++ b/drivers/scsi/mpi3mr/mpi3mr_app.c
> @@ -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;
> }
>
> /**
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] scsi: mpi3mr: fix possible crash when setup bsg fail
2024-12-20 1:37 ` Guixin Liu
@ 2024-12-20 17:19 ` Bart Van Assche
2024-12-26 12:10 ` Guixin Liu
0 siblings, 1 reply; 4+ messages in thread
From: Bart Van Assche @ 2024-12-20 17:19 UTC (permalink / raw)
To: Guixin Liu, Sathya Prakash Veerichetty, Kashyap Desai,
Sumit Saxena, Sreekanth Reddy, James E . J . Bottomley,
Martin K . Petersen
Cc: mpi3mr-linuxdrv.pdl, linux-scsi
On 12/19/24 5:37 PM, Guixin Liu wrote:
> Gentle ping...
Has this patch been tested?
Bart.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] scsi: mpi3mr: fix possible crash when setup bsg fail
2024-12-20 17:19 ` Bart Van Assche
@ 2024-12-26 12:10 ` Guixin Liu
0 siblings, 0 replies; 4+ messages in thread
From: Guixin Liu @ 2024-12-26 12:10 UTC (permalink / raw)
To: Bart Van Assche, Sathya Prakash Veerichetty, Kashyap Desai,
Sumit Saxena, Sreekanth Reddy, James E . J . Bottomley,
Martin K . Petersen
Cc: mpi3mr-linuxdrv.pdl, linux-scsi
在 2024/12/21 01:19, Bart Van Assche 写道:
> On 12/19/24 5:37 PM, Guixin Liu wrote:
>> Gentle ping...
>
> Has this patch been tested?
>
> Bart.
Yes, I will send a v3 patch with the crash stack,
Best Regards,
Guixin Liu
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-26 12:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-17 11:04 [PATCH v2] scsi: mpi3mr: fix possible crash when setup bsg fail Guixin Liu
2024-12-20 1:37 ` Guixin Liu
2024-12-20 17:19 ` Bart Van Assche
2024-12-26 12:10 ` Guixin Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.