mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-04 10:19:23 +00:00
d62ecd6c07
Refresh patches 6.12 for airoha and econet Fixes:122135b964("airoha: an7581: add support for kernel 6.12") Fixes:73d0f92460("kernel: Add new platform EcoNet MIPS") Signed-off-by: Leo Barsky <leobrsky@proton.me> Link: https://github.com/openwrt/openwrt/pull/20073 Signed-off-by: Robert Marko <robimarko@gmail.com>
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From c59783780c8ad66f6076a9a7c74df3e006e29519 Mon Sep 17 00:00:00 2001
|
|
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
Date: Sat, 24 May 2025 09:29:11 +0200
|
|
Subject: [PATCH] net: airoha: Fix an error handling path in
|
|
airoha_alloc_gdm_port()
|
|
|
|
If register_netdev() fails, the error handling path of the probe will not
|
|
free the memory allocated by the previous airoha_metadata_dst_alloc() call
|
|
because port->dev->reg_state will not be NETREG_REGISTERED.
|
|
|
|
So, an explicit airoha_metadata_dst_free() call is needed in this case to
|
|
avoid a memory leak.
|
|
|
|
Fixes: af3cf757d5c9 ("net: airoha: Move DSA tag in DMA descriptor")
|
|
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/1b94b91345017429ed653e2f05d25620dc2823f9.1746715755.git.christophe.jaillet@wanadoo.fr
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -2880,7 +2880,15 @@ static int airoha_alloc_gdm_port(struct
|
|
if (err)
|
|
return err;
|
|
|
|
- return register_netdev(dev);
|
|
+ err = register_netdev(dev);
|
|
+ if (err)
|
|
+ goto free_metadata_dst;
|
|
+
|
|
+ return 0;
|
|
+
|
|
+free_metadata_dst:
|
|
+ airoha_metadata_dst_free(port);
|
|
+ return err;
|
|
}
|
|
|
|
static int airoha_probe(struct platform_device *pdev)
|