Commit d6e3ae76 authored by Dinghao Liu's avatar Dinghao Liu Committed by Martin K. Petersen
Browse files

scsi: fnic: Fix memleak in vnic_dev_init_devcmd2 

When ioread32() returns 0xFFFFFFFF, we should execute cleanup functions
like other error handling paths before returning.

Link: https://lore.kernel.org/r/20201225083520.22015-1-dinghao.liu@zju.edu.cn


Acked-by: default avatarKaran Tilak Kumar <kartilak@cisco.com>
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b2b0f16f

drivers/scsi/fnic/vnic_dev.c

+5 −3
Original line number Diff line number Diff line
@@ -444,7 +444,8 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) 
	fetch_index = ioread32(&vdev->devcmd2->wq.ctrl->fetch_index);

	if (fetch_index == 0xFFFFFFFF) { /* check for hardware gone  */

		pr_err("error in devcmd2 init");

		return -ENODEV;

		err = -ENODEV;

		goto err_free_wq;

	}



	/*
@@ -460,7 +461,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) 
	err = vnic_dev_alloc_desc_ring(vdev, &vdev->devcmd2->results_ring,

			DEVCMD2_RING_SIZE, DEVCMD2_DESC_SIZE);

	if (err)

		goto err_free_wq;

		goto err_disable_wq;



	vdev->devcmd2->result =

		(struct devcmd2_result *) vdev->devcmd2->results_ring.descs;
@@ -481,8 +482,9 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) 


err_free_desc_ring:

	vnic_dev_free_desc_ring(vdev, &vdev->devcmd2->results_ring);

err_free_wq:

err_disable_wq:

	vnic_wq_disable(&vdev->devcmd2->wq);

err_free_wq:

	vnic_wq_free(&vdev->devcmd2->wq);

err_free_devcmd2:

	kfree(vdev->devcmd2);