[PATCH] driver: nvme: fix missing error code

Keith Busch kbusch at kernel.org
Tue Nov 30 07:47:54 PST 2021


On Tue, Nov 30, 2021 at 09:50:14PM +0800, Dongliang Mu wrote:
> Smatch reports:
> 
> drivers/nvme/host/multipath.c:865
> nvme_mpath_init_identify() warn: missing error code 'error'
> 
> In one error handling path of nvme_mpath_init_identify(Line 865), error
> is not initialized as an errno.
> 
> Fix this by assigning error to -EINVAL.

Nak, the code is correct as-is. Returning a negetive error will abort
the initialization process. We don't need ANA support in order to manage
this controller, so failing a controller for an optional condition
isn't helpful.

The other parts of this function returning negetive errors should be
fixed to return 0, though.
 
> Signed-off-by: Dongliang Mu <mudongliangabcd at gmail.com>
> ---
>  drivers/nvme/host/multipath.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
> index 7f2071f2460c..2cbeb6d6b064 100644
> --- a/drivers/nvme/host/multipath.c
> +++ b/drivers/nvme/host/multipath.c
> @@ -862,6 +862,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
>  			"ANA log page size (%zd) larger than MDTS (%zd).\n",
>  			ana_log_size, max_transfer_size);
>  		dev_err(ctrl->device, "disabling ANA support.\n");
> +		error = -EINVAL;
>  		goto out_uninit;
>  	}
>  	if (ana_log_size > ctrl->ana_log_size) {
> -- 
> 2.25.1
> 



More information about the Linux-nvme mailing list