lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 082/633] EDAC/i5100: Fix error handling order in i5100_init_one()
    Date
    From: Dinghao Liu <dinghao.liu@zju.edu.cn>

    [ Upstream commit 857a3139bd8be4f702c030c8ca06f3fd69c1741a ]

    When pci_get_device_func() fails, the driver doesn't need to execute
    pci_dev_put(). mci should still be freed, though, to prevent a memory
    leak. When pci_enable_device() fails, the error injection PCI device
    "einj" doesn't need to be disabled either.

    [ bp: Massage commit message, rename label to "bail_mc_free". ]

    Fixes: 52608ba205461 ("i5100_edac: probe for device 19 function 0")
    Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/20200826121437.31606-1-dinghao.liu@zju.edu.cn
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/edac/i5100_edac.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
    index 191aa7c19ded7..324a46b8479b0 100644
    --- a/drivers/edac/i5100_edac.c
    +++ b/drivers/edac/i5100_edac.c
    @@ -1061,16 +1061,15 @@ static int i5100_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
    PCI_DEVICE_ID_INTEL_5100_19, 0);
    if (!einj) {
    ret = -ENODEV;
    - goto bail_einj;
    + goto bail_mc_free;
    }

    rc = pci_enable_device(einj);
    if (rc < 0) {
    ret = rc;
    - goto bail_disable_einj;
    + goto bail_einj;
    }

    -
    mci->pdev = &pdev->dev;

    priv = mci->pvt_info;
    @@ -1136,14 +1135,14 @@ static int i5100_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
    bail_scrub:
    priv->scrub_enable = 0;
    cancel_delayed_work_sync(&(priv->i5100_scrubbing));
    - edac_mc_free(mci);
    -
    -bail_disable_einj:
    pci_disable_device(einj);

    bail_einj:
    pci_dev_put(einj);

    +bail_mc_free:
    + edac_mc_free(mci);
    +
    bail_disable_ch1:
    pci_disable_device(ch1mm);

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 18:28    [W:2.079 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site