Commit 89fbe672 authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Kalle Valo
Browse files

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

This reverts commit 92da4ce8.

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/201f06b6-14f5-41bb-8897-49665cf14b66@nbd.name


Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20240808103758.11696-1-toke@toke.dk
parent a66de2d0

drivers/net/wireless/ath/ath9k/ahb.c

+5 −2
Original line number Diff line number Diff line
@@ -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);

	}

}

drivers/net/wireless/ath/ath9k/pci.c

+6 −3
Original line number Diff line number Diff line
@@ -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);

}