[PATCH] net: sxgbe: dispose IRQ mappings on device removal
From: Guangshuo Li <hidden>
Date: 2026-09-16 05:48:51
Also in:
lkml, stable
Subsystem:
networking drivers, samsung sxgbe drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Byungho An, Linus Torvalds
sxgbe_platform_probe() creates interrupt mappings for the common,
TX, RX and LPI interrupts with irq_of_parse_and_map().
The probe failure path disposes the common, TX and RX mappings with
irq_dispose_mapping(). However, after a successful probe, the mappings
are never disposed when the device is removed.
Register a devres action for each IRQ mapping immediately after it is
created. This also guarantees that devres-managed IRQ handlers are
released before their mappings are disposed.
This issue was found by manual code inspection.
Fixes: 1edb9ca69e8a ("net: sxgbe: add basic framework for Samsung 10Gb ethernet driver")
Cc: stable@vger.kernel.org
Signed-off-by: Guangshuo Li <redacted>
---
.../ethernet/samsung/sxgbe/sxgbe_platform.c | 41 +++++++++++++------
1 file changed, 29 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
index e4701b29e1a0..cd8d39a1afff 100644
--- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
+++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c@@ -67,6 +67,13 @@ static int sxgbe_probe_config_dt(struct platform_device *pdev, } #endif /* CONFIG_OF */ +static void sxgbe_irq_dispose_mapping(void *data) +{ + unsigned int irq = (unsigned int)(unsigned long)data; + + irq_dispose_mapping(irq); +} + /** * sxgbe_platform_probe * @pdev: platform device pointer
@@ -116,6 +123,11 @@ static int sxgbe_platform_probe(struct platform_device *pdev) goto err_drv_remove; } + ret = devm_add_action_or_reset(dev, sxgbe_irq_dispose_mapping, + (void *)(unsigned long)priv->irq); + if (ret) + goto err_drv_remove; + /* Get MAC address if available (DT) */ of_get_ethdev_address(node, priv->dev);
@@ -124,38 +136,43 @@ static int sxgbe_platform_probe(struct platform_device *pdev) priv->txq[i]->irq_no = irq_of_parse_and_map(node, chan++); if (priv->txq[i]->irq_no <= 0) { dev_err(dev, "sxgbe tx irq parsing failed\n"); - goto err_tx_irq_unmap; + goto err_drv_remove; } + ret = devm_add_action_or_reset(dev, sxgbe_irq_dispose_mapping, + (void *)(unsigned long) + priv->txq[i]->irq_no); + if (ret) + goto err_drv_remove; } for (i = 0; i < SXGBE_RX_QUEUES; i++) { priv->rxq[i]->irq_no = irq_of_parse_and_map(node, chan++); if (priv->rxq[i]->irq_no <= 0) { dev_err(dev, "sxgbe rx irq parsing failed\n"); - goto err_rx_irq_unmap; + goto err_drv_remove; } + ret = devm_add_action_or_reset(dev, sxgbe_irq_dispose_mapping, + (void *)(unsigned long) + priv->rxq[i]->irq_no); + if (ret) + goto err_drv_remove; } priv->lpi_irq = irq_of_parse_and_map(node, chan); if (priv->lpi_irq <= 0) { dev_err(dev, "sxgbe lpi irq parsing failed\n"); - goto err_rx_irq_unmap; + goto err_drv_remove; } - + ret = devm_add_action_or_reset(dev, sxgbe_irq_dispose_mapping, + (void *)(unsigned long)priv->lpi_irq); + if (ret) + goto err_drv_remove; platform_set_drvdata(pdev, priv->dev); pr_debug("platform driver registration completed\n"); return 0; -err_rx_irq_unmap: - while (i--) - irq_dispose_mapping(priv->rxq[i]->irq_no); - i = SXGBE_TX_QUEUES; -err_tx_irq_unmap: - while (i--) - irq_dispose_mapping(priv->txq[i]->irq_no); - irq_dispose_mapping(priv->irq); err_drv_remove: sxgbe_drv_remove(priv->dev); err_out:
--
2.43.0