RE: [EXT] [PATCH] scsi: qedi: qedi_main.c: modify the code flow in 'qedi_alloc_global_queues'

From: Manish Rangankar
Date: Mon Apr 24 2023 - 00:25:53 EST



> -----Original Message-----
> From: Peizhi Li <meetlpz@xxxxxxxxxxx>
> Sent: Saturday, April 22, 2023 3:46 PM
> To: Nilesh Javali <njavali@xxxxxxxxxxx>; Manish Rangankar
> <mrangankar@xxxxxxxxxxx>; GR-QLogic-Storage-Upstream <GR-QLogic-
> Storage-Upstream@xxxxxxxxxxx>; James E.J. Bottomley
> <jejb@xxxxxxxxxxxxx>; Martin K. Petersen <martin.petersen@xxxxxxxxxx>
> Cc: hust-os-kernel-patches@xxxxxxxxxxxxxxxx; Peizhi Li
> <meetlpz@xxxxxxxxxxx>; Dongliang Mu <dzm91@xxxxxxxxxxx>; Dan
> Carpenter <dan.carpenter@xxxxxxxxxx>; linux-scsi@xxxxxxxxxxxxxxx; linux-
> kernel@xxxxxxxxxxxxxxx
> Subject: [EXT] [PATCH] scsi: qedi: qedi_main.c: modify the code flow in
> 'qedi_alloc_global_queues'
>
> External Email
>
> ----------------------------------------------------------------------
> When goto the mem_alloc_failure, it will result in a null pointer reference to
> variable 'gl' in function 'qedi_free_global_queues', due to the 'qedi-
> >global_queues' not being allocated.
>
> Fix this by returning -EINVAL directly.
>
> Signed-off-by: Peizhi Li <meetlpz@xxxxxxxxxxx>
> Reviewed-by: Dongliang Mu <dzm91@xxxxxxxxxxx>
> Reviewed-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> ---
> The issue is found by static analysis and remains untested. Meanwhile, this
> patches is similar with qedf which Jinhong Zhu fixed already.
>
> https://urldefense.proofpoint.com/v2/url?u=https-
> 3A__lore.kernel.org_all_20230417135518.184595-2D1-2Djinhongzhu-
> 40hust.edu.cn_&d=DwIDAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=At6ko6G2bm
> E5NMB-6KMSliwRneAzZrOmmK21YHGCrqw&m=5ieD0l90bssMZBp8xnyd-
> eE3D1n_4P8CQfuaR8BW1hauGGhRlK891lfcT4e-
> UAyo&s=DshVk_3xiEVzwIyxpk90ObNr4U4lx6daDaS3uuN6t6g&e=
> drivers/scsi/qedi/qedi_main.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
> index f2ee49756df8..34f38e0f1c7d 100644
> --- a/drivers/scsi/qedi/qedi_main.c
> +++ b/drivers/scsi/qedi/qedi_main.c
> @@ -1637,8 +1637,7 @@ static int qedi_alloc_global_queues(struct qedi_ctx
> *qedi)
> * addresses of our queues
> */
> if (!qedi->p_cpuq) {
> - status = -EINVAL;
> - goto mem_alloc_failure;
> + return -EINVAL;
> }
>
> qedi->global_queues = kzalloc((sizeof(struct global_queue *) *
> --
> 2.25.1

Thanks,

Acked-by: Manish Rangankar <mrangankar@xxxxxxxxxxx>