Commit ac7996d6 authored by Colin Ian King's avatar Colin Ian King Committed by Jakub Kicinski
Browse files

octeontx2-af: fix memory leak of lmac and lmac->name 



Currently the error return paths don't kfree lmac and lmac->name
leading to some memory leaks.  Fix this by adding two error return
paths that kfree these objects

Addresses-Coverity: ("Resource leak")
Fixes: 1463f382 ("octeontx2-af: Add support for CGX link management")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20210107123916.189748-1-colin.king@canonical.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 85bd6055

drivers/net/ethernet/marvell/octeontx2/af/cgx.c

+11 −3
Original line number Diff line number Diff line
@@ -871,8 +871,10 @@ static int cgx_lmac_init(struct cgx *cgx) 
		if (!lmac)

			return -ENOMEM;

		lmac->name = kcalloc(1, sizeof("cgx_fwi_xxx_yyy"), GFP_KERNEL);

		if (!lmac->name)

			return -ENOMEM;

		if (!lmac->name) {

			err = -ENOMEM;

			goto err_lmac_free;

		}

		sprintf(lmac->name, "cgx_fwi_%d_%d", cgx->cgx_id, i);

		lmac->lmac_id = i;

		lmac->cgx = cgx;
@@ -883,7 +885,7 @@ static int cgx_lmac_init(struct cgx *cgx) 
						 CGX_LMAC_FWI + i * 9),

				   cgx_fwi_event_handler, 0, lmac->name, lmac);

		if (err)

			return err;

			goto err_irq;



		/* Enable interrupt */

		cgx_write(cgx, lmac->lmac_id, CGXX_CMRX_INT_ENA_W1S,
@@ -895,6 +897,12 @@ static int cgx_lmac_init(struct cgx *cgx) 
	}



	return cgx_lmac_verify_fwi_version(cgx);



err_irq:

	kfree(lmac->name);

err_lmac_free:

	kfree(lmac);

	return err;

}



static int cgx_lmac_exit(struct cgx *cgx)