lkml.org 
[lkml]   [2012]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/23] PNPACPI: Fix device ref leaking in acpi_pnp_match
    Date
    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 put_device calling before returning.

    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    Cc: stable@kernel.org
    Cc: Len Brown <lenb@kernel.org>
    Cc: Adam Belay <abelay@mit.edu>
    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Cc: linux-acpi@vger.kernel.org
    ---
    drivers/pnp/pnpacpi/core.c | 7 ++++++-
    1 files changed, 6 insertions(+), 1 deletions(-)

    diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
    index b00c176..d21e8f5 100644
    --- a/drivers/pnp/pnpacpi/core.c
    +++ b/drivers/pnp/pnpacpi/core.c
    @@ -321,9 +321,14 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp)
    {
    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));
    }

    --
    1.7.7


    \
     
     \ /
      Last update: 2012-03-06 08:17    [W:0.021 / U:0.136 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site