2022-07-18 05:01:15

by Yang Yingliang

Subject: [PATCH -next] ublk_drv: fix missing error return code in ublk_add_dev()

If blk_mq_init_queue() fails, it should return error code in ublk_add_dev()

Fixes: cebbe577cb17 ("ublk_drv: fix request queue leak")
Signed-off-by: Yang Yingliang <[email protected]>
---
drivers/block/ublk_drv.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 52fd0af8a4f2..bea441782cb0 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -1169,8 +1169,10 @@ static int ublk_add_dev(struct ublk_device *ub)
goto out_deinit_queues;

ub->ub_queue = blk_mq_init_queue(&ub->tag_set);
- if (IS_ERR(ub->ub_queue))
+ if (IS_ERR(ub->ub_queue)) {
+ err = PTR_ERR(ub->ub_queue);
goto out_cleanup_tags;
+ }
ub->ub_queue->queuedata = ub;

disk = ub->ub_disk = blk_mq_alloc_disk_for_queue(ub->ub_queue,
--
2.25.1

2022-07-18 07:58:13

by Ming Lei

Subject: Re: [PATCH -next] ublk_drv: fix missing error return code in ublk_add_dev()

On Mon, Jul 18, 2022 at 12:24:08PM +0800, Yang Yingliang wrote:
> If blk_mq_init_queue() fails, it should return error code in ublk_add_dev()
>
> Fixes: cebbe577cb17 ("ublk_drv: fix request queue leak")
> Signed-off-by: Yang Yingliang <[email protected]>
> ---
> drivers/block/ublk_drv.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
> index 52fd0af8a4f2..bea441782cb0 100644
> --- a/drivers/block/ublk_drv.c
> +++ b/drivers/block/ublk_drv.c
> @@ -1169,8 +1169,10 @@ static int ublk_add_dev(struct ublk_device *ub)
> goto out_deinit_queues;
>
> ub->ub_queue = blk_mq_init_queue(&ub->tag_set);
> - if (IS_ERR(ub->ub_queue))
> + if (IS_ERR(ub->ub_queue)) {
> + err = PTR_ERR(ub->ub_queue);
> goto out_cleanup_tags;
> + }
> ub->ub_queue->queuedata = ub;
>
> disk = ub->ub_disk = blk_mq_alloc_disk_for_queue(ub->ub_queue,

Reviewed-by: Ming Lei <[email protected]>


Thanks,
Ming

2022-07-18 19:29:44

by Jens Axboe

Subject: Re: [PATCH -next] ublk_drv: fix missing error return code in ublk_add_dev()

On Mon, 18 Jul 2022 12:24:08 +0800, Yang Yingliang wrote:
> If blk_mq_init_queue() fails, it should return error code in ublk_add_dev()
>
>

Applied, thanks!

[1/1] ublk_drv: fix missing error return code in ublk_add_dev()
commit: f50e5d670c622349277a46996a70386cc3661b10

Best regards,
--
Jens Axboe