From patchwork Tue Jun 9 19:09:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Chiang X-Patchwork-Id: 29079 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n59J7rsQ003730 for ; Tue, 9 Jun 2009 19:09:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753927AbZFITJM (ORCPT ); Tue, 9 Jun 2009 15:09:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753911AbZFITJM (ORCPT ); Tue, 9 Jun 2009 15:09:12 -0400 Received: from g1t0029.austin.hp.com ([15.216.28.36]:12902 "EHLO g1t0029.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752365AbZFITJL (ORCPT ); Tue, 9 Jun 2009 15:09:11 -0400 Received: from g5t0030.atlanta.hp.com (g5t0030.atlanta.hp.com [16.228.8.142]) by g1t0029.austin.hp.com (Postfix) with ESMTP id 9649F38133; Tue, 9 Jun 2009 19:09:12 +0000 (UTC) Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30]) by g5t0030.atlanta.hp.com (Postfix) with ESMTP id BB9432408B; Tue, 9 Jun 2009 19:09:11 +0000 (UTC) Received: by ldl.fc.hp.com (Postfix, from userid 17609) id 6C53A3A42F7; Tue, 9 Jun 2009 13:09:11 -0600 (MDT) Date: Tue, 9 Jun 2009 13:09:11 -0600 From: Alex Chiang To: Kenji Kaneshige Cc: lenb@kernel.org, linux-acpi@vger.kernel.org, Bjorn Helgaas , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: Re: [PATCH v2 07/11] ACPI: acpi_pci_unbind should clean up properly after acpi_pci_bind Message-ID: <20090609190911.GE23647@ldl.fc.hp.com> References: <20090604054504.18802.21690.stgit@bob.kio> <20090604055852.18802.22743.stgit@bob.kio> <4A2788FA.2050606@jp.fujitsu.com> <20090604233521.GA12900@ethanol> <4A2C8429.2020401@jp.fujitsu.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4A2C8429.2020401@jp.fujitsu.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org * Kenji Kaneshige : > Alex Chiang wrote: >> diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c >> index 62cb383..c9cc650 100644 >> --- a/drivers/acpi/pci_bind.c >> +++ b/drivers/acpi/pci_bind.c >> @@ -109,11 +109,13 @@ static int acpi_pci_unbind(struct acpi_device *device) >> struct pci_dev *dev; >> dev = acpi_get_pci_dev(device->handle); >> - if (!dev) >> + if (!dev || !dev->subordinate) >> return 0; > > This would leak the pci_dev's refcount > if dev != NULL && dev->subordinate == NULL. Yes, of course you are correct. Thanks for correcting my sloppiness. Here is the correct fix. From: Alex Chiang ACPI: acpi_pci_unbind should clean up properly after acpi_pci_bind In acpi_pci_bind, we set device->ops.bind and device->ops.unbind, but never clear them out. Cc: Bjorn Helgaas Signed-off-by: Alex Chiang --- -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c index 62cb383..af75784 100644 --- a/drivers/acpi/pci_bind.c +++ b/drivers/acpi/pci_bind.c @@ -109,12 +109,15 @@ static int acpi_pci_unbind(struct acpi_device *device) struct pci_dev *dev; dev = acpi_get_pci_dev(device->handle); - if (!dev) - return 0; + if (!dev || !dev->subordinate) + goto out: - if (dev->subordinate) - acpi_pci_irq_del_prt(dev->subordinate); + acpi_pci_irq_del_prt(dev->subordinate); + device->ops.bind = NULL; + device->ops.unbind = NULL; + +out: pci_dev_put(dev); return 0; }