Commit efb24b1f authored by Miaoqing Pan's avatar Miaoqing Pan Committed by Jeff Johnson
Browse files

wifi: ath11k: fix memory leak in ath11k_xxx_remove() 

The firmware memory was allocated in ath11k_pci_probe() or
ath11k_ahb_probe(), but not freed in ath11k_xxx_remove() in case
ATH11K_FLAG_QMI_FAIL bit is set. So call ath11k_fw_destroy() to
free the memory.

Found while fixing the same problem in ath12k:
https://lore.kernel.org/linux-wireless/20240314012746.2729101-1-quic_miaoqing@quicinc.com



Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-04546-QCAHSPSWPL_V1_V2_SILICONZ_IOE-1

Signed-off-by: default avatarMiaoqing Pan <quic_miaoqing@quicinc.com>
Reviewed-by: default avatarAditya Kumar Singh <aditya.kumar.singh@oss.qualcomm.com>
Link: https://patch.msgid.link/20250123084948.1124357-1-quic_miaoqing@quicinc.com


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent 79e7b04b

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

+3 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause-Clear

/*

 * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <linux/module.h>
@@ -1290,6 +1290,7 @@ static void ath11k_ahb_remove(struct platform_device *pdev) 
	ath11k_core_deinit(ab);



qmi_fail:

	ath11k_fw_destroy(ab);

	ath11k_ahb_free_resources(ab);

}
@@ -1309,6 +1310,7 @@ static void ath11k_ahb_shutdown(struct platform_device *pdev) 
	ath11k_core_deinit(ab);



free_resources:

	ath11k_fw_destroy(ab);

	ath11k_ahb_free_resources(ab);

}

drivers/net/wireless/ath/ath11k/core.c

+1 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause-Clear

/*

 * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <linux/module.h>
@@ -2346,7 +2346,6 @@ void ath11k_core_deinit(struct ath11k_base *ab) 
	ath11k_hif_power_down(ab);

	ath11k_mac_destroy(ab);

	ath11k_core_soc_destroy(ab);

	ath11k_fw_destroy(ab);

}

EXPORT_SYMBOL(ath11k_core_deinit);

drivers/net/wireless/ath/ath11k/fw.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause-Clear

/*

 * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include "core.h"
@@ -166,3 +166,4 @@ void ath11k_fw_destroy(struct ath11k_base *ab) 
{

	release_firmware(ab->fw.fw);

}

EXPORT_SYMBOL(ath11k_fw_destroy);

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

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause-Clear

/*

 * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#include <linux/module.h>
@@ -984,6 +984,7 @@ static void ath11k_pci_remove(struct pci_dev *pdev) 
	ath11k_core_deinit(ab);



qmi_fail:

	ath11k_fw_destroy(ab);

	ath11k_mhi_unregister(ab_pci);



	ath11k_pcic_free_irq(ab);