From patchwork Tue Jan 14 23:11:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Djalal Harouni X-Patchwork-Id: 3488751 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1CCD0C02DC for ; Tue, 14 Jan 2014 23:17:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0C7720253 for ; Tue, 14 Jan 2014 23:17:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A18FA201BA for ; Tue, 14 Jan 2014 23:17:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751559AbaANXRt (ORCPT ); Tue, 14 Jan 2014 18:17:49 -0500 Received: from numidia.opendz.org ([98.142.220.152]:43554 "EHLO numidia.opendz.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750906AbaANXRs (ORCPT ); Tue, 14 Jan 2014 18:17:48 -0500 X-Greylist: delayed 365 seconds by postgrey-1.27 at vger.kernel.org; Tue, 14 Jan 2014 18:17:48 EST Received: from localhost (localhost [127.0.0.1]) by numidia.opendz.org (Postfix) with ESMTPSA id AB4E317B405D; Tue, 14 Jan 2014 23:11:41 +0000 (UTC) From: Djalal Harouni To: Bjorn Helgaas , linux-pci@vger.kernel.org Cc: Djalal Harouni Subject: [PATCH] PCI: fix a memory leak of pci_host_bridge on error path Date: Wed, 15 Jan 2014 00:11:19 +0100 Message-Id: <1389741079-12976-1-git-send-email-tixxdz@opendz.org> X-Mailer: git-send-email 1.7.11.7 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On error paths make sure that the pci_host_bridge struct is freed. Signed-off-by: Djalal Harouni --- On top of linux-next. drivers/pci/probe.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 23cdfac..483566c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1771,15 +1771,13 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, bridge->dev.release = pci_release_host_bridge_dev; dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); error = pcibios_root_bridge_prepare(bridge); - if (error) { - kfree(bridge); - goto err_out; - } + if (error) + goto host_bridge_err; error = device_register(&bridge->dev); if (error) { put_device(&bridge->dev); - goto err_out; + goto host_bridge_err; } b->bridge = get_device(&bridge->dev); device_enable_async_suspend(b->bridge); @@ -1836,6 +1834,8 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, class_dev_reg_err: put_device(&bridge->dev); device_unregister(&bridge->dev); +host_bridge_err: + kfree(bridge); err_out: kfree(b); return NULL;