Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Reply-To: dgilbert@interlog.com
Subject: Re: [PATCH] [v2] scsi: scsi_debug: Fix memleak in scsi_debug_init
To:     Dinghao Liu <dinghao.liu@zju.edu.cn>, kjlu@umn.edu
Cc:     "James E.J. Bottomley" <jejb@linux.ibm.com>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20201226061503.20050-1-dinghao.liu@zju.edu.cn>
From:   Douglas Gilbert <dgilbert@interlog.com>
Message-ID: <fc129fb4-a255-68cd-92e1-3206ac2b085f@interlog.com>
Date:   Sat, 26 Dec 2020 19:46:39 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.10.0
MIME-Version: 1.0
In-Reply-To: <20201226061503.20050-1-dinghao.liu@zju.edu.cn>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-CA
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2020-12-26 1:15 a.m., Dinghao Liu wrote:
> When sdeb_zbc_model does not match BLK_ZONED_NONE,
> BLK_ZONED_HA or BLK_ZONED_HM, we should free sdebug_q_arr
> to prevent memleak. Also there is no need to execute
> sdebug_erase_store() on failure of sdeb_zbc_model_str().
> 
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>

Acked-by: Douglas Gilbert <dgilbert@interlog.com>

Thanks.

> ---
> 
> Changelog:
> 
> v2: - Add missed assignment statement for ret.
> ---
>   drivers/scsi/scsi_debug.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
> index 24c0f7ec0351..4a08c450b756 100644
> --- a/drivers/scsi/scsi_debug.c
> +++ b/drivers/scsi/scsi_debug.c
> @@ -6740,7 +6740,7 @@ static int __init scsi_debug_init(void)
>   		k = sdeb_zbc_model_str(sdeb_zbc_model_s);
>   		if (k < 0) {
>   			ret = k;
> -			goto free_vm;
> +			goto free_q_arr;
>   		}
>   		sdeb_zbc_model = k;
>   		switch (sdeb_zbc_model) {
> @@ -6753,7 +6753,8 @@ static int __init scsi_debug_init(void)
>   			break;
>   		default:
>   			pr_err("Invalid ZBC model\n");
> -			return -EINVAL;
> +			ret = -EINVAL;
> +			goto free_q_arr;
>   		}
>   	}
>   	if (sdeb_zbc_model != BLK_ZONED_NONE) {
>