From: Ziyang Xuan <william.xuanziyang@huawei.com>

Date: Fri, 2 Dec 2022 19:04:30 +0800

Subject: octeontx2-pf: Fix potential memory leak in otx2_init_tc()

Patch-mainline: v6.1

Git-commit: fbf33f5ac76f2cdb47ad9763f620026d5cfa57ce

References: jsc#SLE-24682

In otx2_init_tc(), if rhashtable_init() failed, it does not free

tc->tc_entries_bitmap which is allocated in otx2_tc_alloc_ent_bitmap().

Fixes: 2e2a8126ffac ("octeontx2-pf: Unify flow management variables")

Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>

Reviewed-by: Leon Romanovsky <leonro@nvidia.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>

---

 drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c |    7 ++++++-

 1 file changed, 6 insertions(+), 1 deletion(-)

--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c

+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c

@@ -1091,7 +1091,12 @@ int otx2_init_tc(struct otx2_nic *nic)

 		return err;

 	tc->flow_ht_params = tc_flow_ht_params;

-	return rhashtable_init(&tc->flow_table, &tc->flow_ht_params);

+	err = rhashtable_init(&tc->flow_table, &tc->flow_ht_params);

+	if (err) {

+		kfree(tc->tc_entries_bitmap);

+		tc->tc_entries_bitmap = NULL;

+	}

+	return err;

 }

 EXPORT_SYMBOL(otx2_init_tc);