Revert "wifi: ath9k: use devm for request_irq()"

This reverts commit 92da4ce847bc5d942ddfdb102dba92f4e2797a59.

Felix pointed out that moving to devm for request_irq() can lead to a use after
free, and that avoiding that means having explicit frees that makes the devm
thing pretty pointless. So let's just revert the patch.

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Toke Høiland-Jørgensen <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>
Link: https://patch.msgid.link/[email protected]

diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 29f67ded8fe2a1caac12ad4a53b02d35651854db..1a6697b6e3b41fd6de77cd09a875986733787cc1 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -118,7 +118,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
        sc->mem = mem;
        sc->irq = irq;
 
-       ret = devm_request_irq(&pdev->dev, irq, ath_isr, IRQF_SHARED, "ath9k", sc);
+       ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc);
        if (ret) {
                dev_err(&pdev->dev, "request_irq failed\n");
                goto err_free_hw;
@@ -127,7 +127,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
        ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops);
        if (ret) {
                dev_err(&pdev->dev, "failed to initialize device\n");
-               goto err_free_hw;
+               goto err_irq;
        }
 
        ah = sc->sc_ah;
@@ -137,6 +137,8 @@ static int ath_ahb_probe(struct platform_device *pdev)
 
        return 0;
 
+ err_irq:
+       free_irq(irq, sc);
  err_free_hw:
        ieee80211_free_hw(hw);
        return ret;
@@ -150,6 +152,7 @@ static void ath_ahb_remove(struct platform_device *pdev)
                struct ath_softc *sc = hw->priv;
 
                ath9k_deinit_device(sc);
+               free_irq(sc->irq, sc);
                ieee80211_free_hw(sc->hw);
        }
 }

diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index ccf73886199af490e992ba7da4665503c15a8d38..1ff53520f0a30c338243a6b6ea6c2d09d1fb5780 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -965,9 +965,9 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        }
 
        if (!msi_enabled)
-               ret = devm_request_irq(&pdev->dev, pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc);
+               ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath9k", sc);
        else
-               ret = devm_request_irq(&pdev->dev, pdev->irq, ath_isr, 0, "ath9k", sc);
+               ret = request_irq(pdev->irq, ath_isr, 0, "ath9k", sc);
 
        if (ret) {
                dev_err(&pdev->dev, "request_irq failed\n");
@@ -979,7 +979,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        ret = ath9k_init_device(id->device, sc, &ath_pci_bus_ops);
        if (ret) {
                dev_err(&pdev->dev, "Failed to initialize device\n");
-               goto err_irq;
+               goto err_init;
        }
 
        sc->sc_ah->msi_enabled = msi_enabled;
@@ -991,6 +991,8 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        return 0;
 
+err_init:
+       free_irq(sc->irq, sc);
 err_irq:
        ieee80211_free_hw(hw);
        return ret;
@@ -1004,6 +1006,7 @@ static void ath_pci_remove(struct pci_dev *pdev)
        if (!is_ath9k_unloaded)
                sc->sc_ah->ah_flags |= AH_UNPLUGGED;
        ath9k_deinit_device(sc);
+       free_irq(sc->irq, sc);
        ieee80211_free_hw(sc->hw);
 }