[PATCH v2] wifi: ath12k: fix memory leak in ath12k_pci_remove()

[PATCH v2] wifi: ath12k: fix memory leak in ath12k_pci_remove()

[Miaoqing Pan]

Kmemleak reported this error:

  unreferenced object 0xffff1c165cec3060 (size 32):
    comm "insmod", pid 560, jiffies 4296964570 (age 235.596s)
    backtrace:
      [<000000005434db68>] __kmem_cache_alloc_node+0x1f4/0x2c0
      [<000000001203b155>] kmalloc_trace+0x40/0x88
      [<0000000028adc9c8>] _request_firmware+0xb8/0x608
      [<00000000cad1aef7>] firmware_request_nowarn+0x50/0x80
      [<000000005011a682>] local_pci_probe+0x48/0xd0
      [<00000000077cd295>] pci_device_probe+0xb4/0x200
      [<0000000087184c94>] really_probe+0x150/0x2c0

The firmware memory was allocated in ath12k_pci_probe(), but not
freed in ath12k_pci_remove() in case ATH12K_FLAG_QMI_FAIL bit is
set. So call ath12k_fw_unmap() to free the memory.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.2.0-02280-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1

Signed-off-by: Miaoqing Pan <quic_miaoqing@quicinc.com>
---
v2: rebased as Jeff required
---
 drivers/net/wireless/ath/ath12k/pci.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c
index 06cff3849ab8..7a30abda22cd 100644
--- a/drivers/net/wireless/ath/ath12k/pci.c
+++ b/drivers/net/wireless/ath/ath12k/pci.c
@@ -1725,6 +1725,7 @@ static void ath12k_pci_remove(struct pci_dev *pdev)
 	if (test_bit(ATH12K_FLAG_QMI_FAIL, &ab->dev_flags)) {
 		ath12k_pci_power_down(ab, false);
 		ath12k_qmi_deinit_service(ab);
+		ath12k_fw_unmap(ab);
 		ath12k_core_hw_group_unassign(ab);
 		goto qmi_fail;
 	}
-- 
2.25.1

Re: [PATCH v2] wifi: ath12k: fix memory leak in ath12k_pci_remove()

[Aditya Kumar Singh]

On 1/22/25 14:17, Miaoqing Pan wrote:
> --- a/drivers/net/wireless/ath/ath12k/pci.c
> +++ b/drivers/net/wireless/ath/ath12k/pci.c
> @@ -1725,6 +1725,7 @@ static void ath12k_pci_remove(struct pci_dev *pdev)
>   	if (test_bit(ATH12K_FLAG_QMI_FAIL, &ab->dev_flags)) {
>   		ath12k_pci_power_down(ab, false);
>   		ath12k_qmi_deinit_service(ab);
> +		ath12k_fw_unmap(ab);
>   		ath12k_core_hw_group_unassign(ab);
>   		goto qmi_fail;
>   	}

Instead of this, why not move the "qmi_fail:" label above unmap() ?

-- 
Aditya

Re: [PATCH v2] wifi: ath12k: fix memory leak in ath12k_pci_remove()

[Miaoqing Pan]

On 1/23/2025 12:30 AM, Aditya Kumar Singh wrote:
> On 1/22/25 14:17, Miaoqing Pan wrote:
>> --- a/drivers/net/wireless/ath/ath12k/pci.c
>> +++ b/drivers/net/wireless/ath/ath12k/pci.c
>> @@ -1725,6 +1725,7 @@ static void ath12k_pci_remove(struct pci_dev *pdev)
>>       if (test_bit(ATH12K_FLAG_QMI_FAIL, &ab->dev_flags)) {
>>           ath12k_pci_power_down(ab, false);
>>           ath12k_qmi_deinit_service(ab);
>> +        ath12k_fw_unmap(ab);
>>           ath12k_core_hw_group_unassign(ab);
>>           goto qmi_fail;
>>       }
> 
> Instead of this, why not move the "qmi_fail:" label above unmap() ?
> 

Good catch, the code base is changed a lot since the v1.