lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 050/314] m68k/PCI: Fix a memory leak in an error handling path
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit c3f4ec050f56eeab7c1f290321f9b762c95bd332 ]

    If 'ioremap' fails, we must free 'bridge', as done in other error handling
    path bellow.

    Fixes: 19cc4c843f40 ("m68k/PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/m68k/coldfire/pci.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c
    index 62b0eb6cf69a3..84eab0f5e00af 100644
    --- a/arch/m68k/coldfire/pci.c
    +++ b/arch/m68k/coldfire/pci.c
    @@ -216,8 +216,10 @@ static int __init mcf_pci_init(void)

    /* Keep a virtual mapping to IO/config space active */
    iospace = (unsigned long) ioremap(PCI_IO_PA, PCI_IO_SIZE);
    - if (iospace == 0)
    + if (iospace == 0) {
    + pci_free_host_bridge(bridge);
    return -ENODEV;
    + }
    pr_info("Coldfire: PCI IO/config window mapped to 0x%x\n",
    (u32) iospace);

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:23    [W:7.178 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site