From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>, Len Brown <lenb@kernel.org>,
Taku Izumi <izumi.taku@jp.fujitsu.com>,
Jiang Liu <jiang.liu@huawei.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-acpi@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v9 04/11] PCI: Fix a device reference count leakage issue in pci_dev_present()
Date: Thu, 17 Jan 2013 23:53:15 -0800 [thread overview]
Message-ID: <1358495602-22867-5-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1358495602-22867-1-git-send-email-yinghai@kernel.org>
From: Jiang Liu <jiang.liu@huawei.com>
Function pci_get_dev_by_id() will hold a reference count on the pci device
returned, so pci_dev_present() should release the corresponding reference
count to avoid memory leakage.
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/search.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index bf969ba..d0627fa 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -319,13 +319,13 @@ int pci_dev_present(const struct pci_device_id *ids)
WARN_ON(in_interrupt());
while (ids->vendor || ids->subvendor || ids->class_mask) {
found = pci_get_dev_by_id(ids, NULL);
- if (found)
- goto exit;
+ if (found) {
+ pci_dev_put(found);
+ return 1;
+ }
ids++;
}
-exit:
- if (found)
- return 1;
+
return 0;
}
EXPORT_SYMBOL(pci_dev_present);
--
1.7.10.4
next prev parent reply other threads:[~2013-01-18 7:53 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-18 7:53 [PATCH v9 00/11] PCI, ACPI: pci root bus hotplug support / pci match_driver Yinghai Lu
2013-01-18 7:53 ` [PATCH v9 01/11] PCI, acpiphp: Add is_hotplug_bridge detection Yinghai Lu
2013-01-18 7:53 ` [PATCH v9 02/11] PCI: Add root bus children dev's res to fail list Yinghai Lu
2013-01-20 22:30 ` Rafael J. Wysocki
2013-01-18 7:53 ` [PATCH v9 03/11] PCI: Set dev_node early for pci_dev Yinghai Lu
2013-01-18 7:53 ` Yinghai Lu [this message]
2013-01-18 7:53 ` [PATCH v9 05/11] PCI: make PCI device create/destroy logic symmetric Yinghai Lu
2013-01-18 7:53 ` [PATCH v9 06/11] PCI, ACPI, acpiphp: Rename alloc_acpiphp_hp_work() to alloc_acpi_hp_work Yinghai Lu
2013-01-20 22:38 ` Rafael J. Wysocki
2013-01-21 1:54 ` Yinghai Lu
2013-01-18 7:53 ` [PATCH v9 07/11] PCI, acpiphp: Move and enhance hotplug support of pci host bridge Yinghai Lu
2013-01-20 22:55 ` Rafael J. Wysocki
2013-01-21 2:32 ` Yinghai Lu
2013-01-18 7:53 ` [PATCH v9 08/11] PCI, ACPI: debug print for installation of acpi root bridge's notifier Yinghai Lu
2013-01-20 23:00 ` Rafael J. Wysocki
2013-01-21 2:37 ` Yinghai Lu
2013-01-21 12:43 ` Rafael J. Wysocki
2013-01-18 7:53 ` [PATCH v9 09/11] PCI, acpiphp: Don't bailout even no slots found yet Yinghai Lu
2013-01-20 23:08 ` Rafael J. Wysocki
2013-01-21 2:42 ` Yinghai Lu
2013-01-18 7:53 ` [PATCH v9 10/11] PCI: Add match_driver in struct pci_dev Yinghai Lu
2013-01-20 23:15 ` Rafael J. Wysocki
2013-01-21 5:22 ` Yinghai Lu
2013-01-21 12:41 ` Rafael J. Wysocki
2013-01-18 7:53 ` [PATCH v9 11/11] PCI: Put pci dev to device tree as early as possible Yinghai Lu
2013-01-20 23:23 ` Rafael J. Wysocki
2013-01-21 6:46 ` Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358495602-22867-5-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=bhelgaas@google.com \
--cc=izumi.taku@jp.fujitsu.com \
--cc=jiang.liu@huawei.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rjw@sisk.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).