lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 201/348] ath10k: add missing error return code in ath10k_pci_probe()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit e2783e2f39ba99178dedfc1646d5cc0979d1bab3 ]

    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: c0c378f9907c ("ath10k: remove target soc ps code")
    Fixes: 7505f7c3ec1d ("ath10k: create a chip revision whitelist")
    Fixes: f8914a14623a ("ath10k: restore QCA9880-AR1A (v1) detection")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Link: https://lore.kernel.org/r/20210522105822.1091848-3-yangyingliang@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/ath10k/pci.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
    index 53c791cc69a1..0f055e577749 100644
    --- a/drivers/net/wireless/ath/ath10k/pci.c
    +++ b/drivers/net/wireless/ath/ath10k/pci.c
    @@ -3647,8 +3647,10 @@ 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;
    + }
    }
    }

    @@ -3659,11 +3661,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) {
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 08:26    [W:4.054 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site