Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1417467ybz; Sat, 18 Apr 2020 00:09:12 -0700 (PDT) X-Google-Smtp-Source: APiQypK0PtmC1S378O5aDyJRmMbmrjIwpCYcoIFS5rSVgAiS5HVBqTN3ZgWYoSxSCp9qlx/jR/+I X-Received: by 2002:a17:906:130e:: with SMTP id w14mr6802133ejb.155.1587193752239; Sat, 18 Apr 2020 00:09:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587193752; cv=none; d=google.com; s=arc-20160816; b=pdgOKiYs6hyF1A9YWQEMJPBKYUwhFw2JxwuCnQ/2bQ4fgTiU1gZ4y+VBywH81xutSW rQtE00noRvSkKYlhjfXZt53chcBxR9+QYPwOOZl8Iznp1kSh3aWLZU7iCECU2DHj/62y S1WuYcLzNo0Nf+8qqNb1OIcPpW2BXFpuQ3bxpe38540TTH/YsN5/5Rz0cxuCQbjKAvWD xGVOWfSweO7noePbSOwSu2rSzen1Te/Cm4wLKP/qpg1Ch99Cj73xqfrkTvXjJyBToOvx ONXAeO61EqlkSyXnx1D23G5h23fzg0NScGHh5CnIwDZybh4lwX6rmgcxoj1umRp5HPc6 bGpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=YbmhGg8C001ze33RbswYlACiGcieUoKCB87+hgU0eys=; b=i/6Bv8kJJoc70zaduYC4IFtnG7ffFDDGSGAPhbGPjTI7evEikjixtcIc+dN9JnMMba Rmt3OROkfJXwxerYxPFL+HkwiBOhAHeq4Ki3i3jOPeAVkAabb39IveNJPKiDA4yimM6u JII+1FcgytZim/v84+nLgzdLqG31QXsem8xmEgFDc3xILqYBl9c4YvJYBGw/1SF7RX4m A0ovM/c0cE0htCN2fDmxO/NA4c2b1dpZmYbBjNYaUg6YIJelHnpWEvMImuGAx7ktiGjI jvKREci/9ka4uT9HYnPdIim9ncvuK3cE1j1GDA4z8m32tQHetwDwD5absBWs0svdZUJB c44w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y8si402424edv.143.2020.04.18.00.08.49; Sat, 18 Apr 2020 00:09:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725892AbgDRHH5 (ORCPT + 99 others); Sat, 18 Apr 2020 03:07:57 -0400 Received: from smtp06.smtpout.orange.fr ([80.12.242.128]:57015 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725843AbgDRHH4 (ORCPT ); Sat, 18 Apr 2020 03:07:56 -0400 Received: from localhost.localdomain ([90.126.162.40]) by mwinf5d11 with ME id U77s2200G0scBcy0377tWl; Sat, 18 Apr 2020 09:07:54 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 18 Apr 2020 09:07:54 +0200 X-ME-IP: 90.126.162.40 From: Christophe JAILLET To: gerg@linux-m68k.org, geert@linux-m68k.org, bhelgaas@google.com, lorenzo.pieralisi@arm.com Cc: linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] m68k/PCI: Fix a memory leak in an error handling path Date: Sat, 18 Apr 2020 09:07:51 +0200 Message-Id: <20200418070751.25420-1-christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 62b0eb6cf69a..84eab0f5e00a 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.20.1