octeontx2-pf: Fix potential memory leak in otx2_init_tc()
authorZiyang Xuan <william.xuanziyang@huawei.com>
Fri, 2 Dec 2022 11:04:30 +0000 (19:04 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Dec 2022 10:37:26 +0000 (11:37 +0100)
[ Upstream commit fbf33f5ac76f2cdb47ad9763f620026d5cfa57ce ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c

index 75388a65f349eb8219d855112d61646a78be09b2..a42373e6f2593d6f493a0f4d44b60cfd919e3496 100644 (file)
@@ -1090,7 +1090,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;
 }
 
 void otx2_shutdown_tc(struct otx2_nic *nic)