| Message ID | 20221207015001.1755826-1-shaozhengchao@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ed14e5903638f6eb868e3e2b4e610985e6a6c876 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v3] net: thunderbolt: fix memory leak in tbnet_open() | expand |
Wed, Dec 07, 2022 at 02:50:01AM CET, shaozhengchao@huawei.com wrote: >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>
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 7 Dec 2022 09:50:01 +0800 you wrote: > 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> > > [...] Here is the summary with links: - [net,v3] net: thunderbolt: fix memory leak in tbnet_open() https://git.kernel.org/netdev/net/c/ed14e5903638 You are awesome, thank you!
diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c index a52ee2bf5575..6312f67f260e 100644 --- a/drivers/net/thunderbolt.c +++ b/drivers/net/thunderbolt.c @@ -914,6 +914,7 @@ static int tbnet_open(struct net_device *dev) eof_mask, 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;
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> --- v3: add patch description v2: move release ida before free tx_ring --- drivers/net/thunderbolt.c | 1 + 1 file changed, 1 insertion(+)