lkml.org 
[lkml]   [2021]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 114/168] PCI: ibmphp: Fix double unmap of io_mem
    Date
    From: Vishal Aslot <os.vaslot@gmail.com>

    [ Upstream commit faa2e05ad0dccf37f995bcfbb8d1980d66c02c11 ]

    ebda_rsrc_controller() calls iounmap(io_mem) on the error path. Its caller,
    ibmphp_access_ebda(), also calls iounmap(io_mem) on good and error paths.

    Remove the iounmap(io_mem) invocation from ebda_rsrc_controller().

    [bhelgaas: remove item from TODO]
    Link: https://lore.kernel.org/r/20210818165751.591185-1-os.vaslot@gmail.com
    Signed-off-by: Vishal Aslot <os.vaslot@gmail.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/hotplug/TODO | 3 ---
    drivers/pci/hotplug/ibmphp_ebda.c | 5 +----
    2 files changed, 1 insertion(+), 7 deletions(-)

    diff --git a/drivers/pci/hotplug/TODO b/drivers/pci/hotplug/TODO
    index a32070be5adf..cc6194aa24c1 100644
    --- a/drivers/pci/hotplug/TODO
    +++ b/drivers/pci/hotplug/TODO
    @@ -40,9 +40,6 @@ ibmphp:

    * The return value of pci_hp_register() is not checked.

    -* iounmap(io_mem) is called in the error path of ebda_rsrc_controller()
    - and once more in the error path of its caller ibmphp_access_ebda().
    -
    * The various slot data structures are difficult to follow and need to be
    simplified. A lot of functions are too large and too complex, they need
    to be broken up into smaller, manageable pieces. Negative examples are
    diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
    index 11a2661dc062..7fb75401ad8a 100644
    --- a/drivers/pci/hotplug/ibmphp_ebda.c
    +++ b/drivers/pci/hotplug/ibmphp_ebda.c
    @@ -714,8 +714,7 @@ static int __init ebda_rsrc_controller(void)
    /* init hpc structure */
    hpc_ptr = alloc_ebda_hpc(slot_num, bus_num);
    if (!hpc_ptr) {
    - rc = -ENOMEM;
    - goto error_no_hpc;
    + return -ENOMEM;
    }
    hpc_ptr->ctlr_id = ctlr_id;
    hpc_ptr->ctlr_relative_id = ctlr;
    @@ -910,8 +909,6 @@ error:
    kfree(tmp_slot);
    error_no_slot:
    free_ebda_hpc(hpc_ptr);
    -error_no_hpc:
    - iounmap(io_mem);
    return rc;
    }

    --
    2.30.2


    \
     
     \ /
      Last update: 2022-09-17 16:11    [W:4.229 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site