From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753545Ab2CCV35 (ORCPT ); Sat, 3 Mar 2012 16:29:57 -0500 Received: from acsinet15.oracle.com ([141.146.126.227]:27867 "EHLO acsinet15.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751888Ab2CCV34 (ORCPT ); Sat, 3 Mar 2012 16:29:56 -0500 From: Yinghai Lu To: Len Brown , Adam Belay , Bjorn Helgaas Cc: Jesse Barnes , Greg Kroah-Hartman , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu , stable@kerne.org Subject: [PATCH] PNPACPI: Fix device ref leaking in acpi_pnp_match Date: Sat, 3 Mar 2012 13:29:20 -0800 Message-Id: <1330810160-20306-1-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.7 X-Source-IP: ucsinet22.oracle.com [156.151.31.94] X-CT-RefId: str=0001.0A090204.4F528D4A.0060,ss=1,re=0.000,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org During testing pci root bus removal, found some root bus bridge is not freed. If booting with pnpacpi=off, those hostbridge could be freed without problem. It turns out that some devices reference are not released during acpi_pnp_match. that match should not hold one device ref during every calling. Add pu_device calling before returning. Signed-off-by: Yinghai Lu Cc: stable@kerne.org Cc: Len Brown Cc: Adam Belay Cc: Bjorn Helgaas Cc: linux-acpi@vger.kernel.org --- drivers/pnp/pnpacpi/core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Index: linux-2.6/drivers/pnp/pnpacpi/core.c =================================================================== --- linux-2.6.orig/drivers/pnp/pnpacpi/core.c +++ linux-2.6/drivers/pnp/pnpacpi/core.c @@ -321,9 +321,14 @@ static int __init acpi_pnp_match(struct { struct acpi_device *acpi = to_acpi_device(dev); struct pnp_dev *pnp = _pnp; + struct device *physical_device; + + physical_device = acpi_get_physical_device(acpi->handle); + if (physical_device) + put_device(physical_device); /* true means it matched */ - return !acpi_get_physical_device(acpi->handle) + return !physical_device && compare_pnp_id(pnp->id, acpi_device_hid(acpi)); }