From ed14e5903638f6eb868e3e2b4e610985e6a6c876 Mon Sep 17 00:00:00 2001

From: Zhengchao Shao <shaozhengchao@huawei.com>

Date: Wed, 7 Dec 2022 09:50:01 +0800

Subject: [PATCH] net: thunderbolt: fix memory leak in tbnet_open()

Git-commit: ed14e5903638f6eb868e3e2b4e610985e6a6c876

Patch-mainline: v6.1

References: git-fixes

When tb_ring_alloc_rx() failed in tbnet_open(), ida that allocated in

tb_xdomain_alloc_out_hopid() is not released. Add

tb_xdomain_release_out_hopid() to the error path to release ida.

Fixes: 180b0689425c ("thunderbolt: Allow multiple DMA tunnels over a single XDomain connection")

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Reviewed-by: Jiri Pirko <jiri@nvidia.com>

Link: https://lore.kernel.org/r/20221207015001.1755826-1-shaozhengchao@huawei.com

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/net/thunderbolt.c |    1 +

 1 file changed, 1 insertion(+)

--- a/drivers/net/thunderbolt.c

+++ b/drivers/net/thunderbolt.c

@@ -902,6 +902,7 @@ static int tbnet_open(struct net_device

 				tbnet_start_poll, net);

 	if (!ring) {

 		netdev_err(dev, "failed to allocate Rx ring\n");

+		tb_xdomain_release_out_hopid(xd, hopid);

 		tb_ring_free(net->tx_ring.ring);

 		net->tx_ring.ring = NULL;

 		return -ENOMEM;