Commit e2783e2f authored by Yang Yingliang's avatar Yang Yingliang Committed by Kalle Valo
Browse files

ath10k: add missing error return code in ath10k_pci_probe() 



When chip_id is not supported, the resources will be freed
on path err_unsupported, these resources will also be freed
when calling ath10k_pci_remove(), it will cause double free,
so return -ENODEV when it doesn't support the device with wrong
chip_id.

Fixes: c0c378f9 ("ath10k: remove target soc ps code")
Fixes: 7505f7c3 ("ath10k: create a chip revision whitelist")
Fixes: f8914a14 ("ath10k: restore QCA9880-AR1A (v1) detection")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210522105822.1091848-3-yangyingliang@huawei.com
parent 9e88dd43

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

+9 −3
Original line number Diff line number Diff line
@@ -3685,10 +3685,12 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
			ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);

		if (bus_params.chip_id != 0xffffffff) {

			if (!ath10k_pci_chip_is_supported(pdev->device,

							  bus_params.chip_id))

							  bus_params.chip_id)) {

				ret = -ENODEV;

				goto err_unsupported;

			}

		}

	}



	ret = ath10k_pci_chip_reset(ar);

	if (ret) {
@@ -3697,11 +3699,15 @@ static int ath10k_pci_probe(struct pci_dev *pdev, 
	}



	bus_params.chip_id = ath10k_pci_soc_read32(ar, SOC_CHIP_ID_ADDRESS);

	if (bus_params.chip_id == 0xffffffff)

	if (bus_params.chip_id == 0xffffffff) {

		ret = -ENODEV;

		goto err_unsupported;

	}



	if (!ath10k_pci_chip_is_supported(pdev->device, bus_params.chip_id))

	if (!ath10k_pci_chip_is_supported(pdev->device, bus_params.chip_id)) {

		ret = -ENODEV;

		goto err_unsupported;

	}



	ret = ath10k_core_register(ar, &bus_params);

	if (ret) {