lkml.org 
[lkml]   [2021]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 235/296] ptp: ocp: Fix a resource leak in an error handling path
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 9c1bb37f8cad5e2ee1933fa1da9a6baa7876a8e4 ]

    If an error occurs after a successful 'pci_ioremap_bar()' call, it must be
    undone by a corresponding 'pci_iounmap()' call, as already done in the
    remove function.

    Fixes: a7e1abad13f3 ("ptp: Add clock driver for the OpenCompute TimeCard.")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Acked-by: Richard Cochran <richardcochran@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/ptp/ptp_ocp.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
    index 530e5f90095e..0d1034e3ed0f 100644
    --- a/drivers/ptp/ptp_ocp.c
    +++ b/drivers/ptp/ptp_ocp.c
    @@ -324,7 +324,7 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    if (!bp->base) {
    dev_err(&pdev->dev, "io_remap bar0\n");
    err = -ENOMEM;
    - goto out;
    + goto out_release_regions;
    }
    bp->reg = bp->base + OCP_REGISTER_OFFSET;
    bp->tod = bp->base + TOD_REGISTER_OFFSET;
    @@ -347,6 +347,8 @@ ptp_ocp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    return 0;

    out:
    + pci_iounmap(pdev, bp->base);
    +out_release_regions:
    pci_release_regions(pdev);
    out_disable:
    pci_disable_device(pdev);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-31 18:45    [W:4.075 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site