Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20221126012558.34374-1-jiasheng@iscas.ac.cn>
In-Reply-To: <20221126012558.34374-1-jiasheng@iscas.ac.cn>
From:   Ulf Hansson <ulf.hansson@linaro.org>
Date:   Tue, 29 Nov 2022 13:54:35 +0100
Message-ID: <CAPDyKFo6jyL+A82w+ixBgHdAjTry4LiqOU6i0yFzoS-0nntMtg@mail.gmail.com>
Subject: Re: [PATCH v2] memstick/ms_block: Add check for alloc_ordered_workqueue
To:     Jiasheng Jiang <jiasheng@iscas.ac.cn>
Cc:     error27@gmail.com, maximlevitsky@gmail.com, oakad@yahoo.com,
        christophe.jaillet@wanadoo.fr, axboe@kernel.dk, hare@suse.de,
        linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Sat, 26 Nov 2022 at 02:26, Jiasheng Jiang <jiasheng@iscas.ac.cn> wrote:
>
> As the alloc_ordered_workqueue may return NULL pointer,
> it should be better to add check for the return
> value.
> Moreover, the msb->io_queue should be freed if error occurs later.
>
> Fixes: 0ab30494bc4f ("memstick: add support for legacy memorysticks")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>

Applied for next (replaced the earlier applied v1 with v2), thanks!

Kind regards
Uffe


> ---
> Changelog:
>
> v1 -> v2:
>
> 1. Assign error number to rc if alloc_ordered_workqueue fails.
> 2. Free msb->io_queue if error occurs later.
> ---
>  drivers/memstick/core/ms_block.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
> index ba8414519515..04115cd92433 100644
> --- a/drivers/memstick/core/ms_block.c
> +++ b/drivers/memstick/core/ms_block.c
> @@ -2116,6 +2116,11 @@ static int msb_init_disk(struct memstick_dev *card)
>         dbg("Set total disk size to %lu sectors", capacity);
>
>         msb->io_queue = alloc_ordered_workqueue("ms_block", WQ_MEM_RECLAIM);
> +       if (!msb->io_queue) {
> +               rc = -ENOMEM;
> +               goto out_cleanup_disk;
> +       }
> +
>         INIT_WORK(&msb->io_work, msb_io_work);
>         sg_init_table(msb->prealloc_sg, MS_BLOCK_MAX_SEGS+1);
>
> @@ -2125,10 +2130,12 @@ static int msb_init_disk(struct memstick_dev *card)
>         msb_start(card);
>         rc = device_add_disk(&card->dev, msb->disk, NULL);
>         if (rc)
> -               goto out_cleanup_disk;
> +               goto out_destroy_workqueue;
>         dbg("Disk added");
>         return 0;
>
> +out_destroy_workqueue:
> +       destroy_workqueue(msb->io_queue);
>  out_cleanup_disk:
>         put_disk(msb->disk);
>  out_free_tag_set:
> --
> 2.25.1
>