[PATCH v2] scsi: qedf: Fix NULL dereference in error handling

[PATCH v2] scsi: qedf: Fix NULL dereference in error handling

[Jinhong Zhu]

Smatch reported:

drivers/scsi/qedf/qedf_main.c:3056 qedf_alloc_global_queues()
warn: missing unwind goto?

At this point in the function, nothing has been allocated so we can
return directly. In particular the "qedf->global_queues" have not been
allocated so calling qedf_free_global_queues() will lead to a NULL
dereference when we check if (!gl[i]) and "gl" is NULL.

Fixes: 61d8658b4a43 ("scsi: qedf: Add QLogic FastLinQ offload FCoE driver framework.")
Signed-off-by: Jinhong Zhu <jinhongzhu@hust.edu.cn>
Reviewed-by: Dan Carpenter <error27@gmail.com>
---
V2: Fix the wrong "Fixes" tag in V1.
---
 drivers/scsi/qedf/qedf_main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c
index 35e16600fc63..f2c7dd4db9c6 100644
--- a/drivers/scsi/qedf/qedf_main.c
+++ b/drivers/scsi/qedf/qedf_main.c
@@ -3043,9 +3043,8 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf)
 	 * addresses of our queues
 	 */
 	if (!qedf->p_cpuq) {
-		status = -EINVAL;
 		QEDF_ERR(&qedf->dbg_ctx, "p_cpuq is NULL.\n");
-		goto mem_alloc_failure;
+		return -EINVAL;
 	}
 
 	qedf->global_queues = kzalloc((sizeof(struct global_queue *)
-- 
2.34.1

Re: [PATCH v2] scsi: qedf: Fix NULL dereference in error handling

[Martin K. Petersen]

Jinhong,

> Smatch reported:
>
> drivers/scsi/qedf/qedf_main.c:3056 qedf_alloc_global_queues()
> warn: missing unwind goto?
>
> At this point in the function, nothing has been allocated so we can
> return directly. In particular the "qedf->global_queues" have not been
> allocated so calling qedf_free_global_queues() will lead to a NULL
> dereference when we check if (!gl[i]) and "gl" is NULL.

Applied to 6.5/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering