lkml.org 
[lkml]   [2022]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 148/158] ethernet: tulip: fix missing pci_disable_device() on error in tulip_init_one()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit 51ca86b4c9c7c75f5630fa0dbe5f8f0bd98e3c3e ]

    Fix the missing pci_disable_device() before return
    from tulip_init_one() in the error handling case.

    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Link: https://lore.kernel.org/r/20220506094250.3630615-1-yangyingliang@huawei.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/dec/tulip/tulip_core.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
    index 79df5a72877b..0040dcaab945 100644
    --- a/drivers/net/ethernet/dec/tulip/tulip_core.c
    +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
    @@ -1399,8 +1399,10 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

    /* alloc_etherdev ensures aligned and zeroed private structures */
    dev = alloc_etherdev (sizeof (*tp));
    - if (!dev)
    + if (!dev) {
    + pci_disable_device(pdev);
    return -ENOMEM;
    + }

    SET_NETDEV_DEV(dev, &pdev->dev);
    if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) {
    @@ -1785,6 +1787,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

    err_out_free_netdev:
    free_netdev (dev);
    + pci_disable_device(pdev);
    return -ENODEV;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-23 20:14    [W:4.988 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site