linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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
Subject: [PATCH v8 04/22] PCI: Fix a device reference count leakage issue in pci_dev_present()
Date: Fri, 11 Jan 2013 14:40:31 -0800	[thread overview]
Message-ID: <1357944049-29620-5-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1357944049-29620-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>
---
 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


  parent reply	other threads:[~2013-01-11 22:41 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-11 22:40 [PATCH v8 00/22] PCI, ACPI: pci root bus hotplug support / pci match_driver Yinghai Lu
2013-01-11 22:40 ` [PATCH v8 01/22] PCI, acpiphp: Add is_hotplug_bridge detection Yinghai Lu
2013-01-12 21:35   ` Rafael J. Wysocki
2013-01-15  6:45   ` Yijing Wang
2013-01-15  7:05     ` Yinghai Lu
2013-01-11 22:40 ` [PATCH v8 02/22] PCI: Add root bus children dev's res to fail list Yinghai Lu
2013-01-12 21:37   ` Rafael J. Wysocki
2013-01-15  6:23     ` Yinghai Lu
2013-01-15 11:21       ` Rafael J. Wysocki
2013-01-15 15:44         ` Yinghai Lu
2013-01-15 21:52           ` Rafael J. Wysocki
2013-01-15 22:03             ` Yinghai Lu
2013-01-11 22:40 ` [PATCH v8 03/22] PCI: Set dev_node early for pci_dev Yinghai Lu
2013-01-12 21:38   ` Rafael J. Wysocki
2013-01-11 22:40 ` Yinghai Lu [this message]
2013-01-12 21:39   ` [PATCH v8 04/22] PCI: Fix a device reference count leakage issue in pci_dev_present() Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 05/22] PCI: make PCI device create/destroy logic symmetric Yinghai Lu
2013-01-12 21:40   ` Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 06/22] PCI: split registration of PCI bus devices into two stages Yinghai Lu
2013-01-12 22:34   ` Rafael J. Wysocki
2013-01-13 15:25     ` Jiang Liu
2013-01-15  6:29       ` Yinghai Lu
2013-01-11 22:40 ` [PATCH v8 07/22] ACPI: Separate acpi_bus_trim to support two steps Yinghai Lu
2013-01-12 22:40   ` Rafael J. Wysocki
2013-01-15  6:31     ` Yinghai Lu
2013-01-15 11:22       ` Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 08/22] PCI, acpiphp: Separate out hot-add support of pci host bridge Yinghai Lu
2013-01-12 23:18   ` Rafael J. Wysocki
2013-01-15  6:44     ` Yinghai Lu
2013-01-15 15:54       ` Yinghai Lu
2013-01-15 22:00         ` Rafael J. Wysocki
2013-01-15 22:04           ` Yinghai Lu
2013-01-11 22:40 ` [PATCH v8 09/22] PCI, ACPI: Add pci_root_hp hot removal notification support Yinghai Lu
2013-01-12 23:26   ` Rafael J. Wysocki
2013-01-15  6:45     ` Yinghai Lu
2013-01-11 22:40 ` [PATCH v8 10/22] ACPI: Introduce a new acpi handle to determine HID match Yinghai Lu
2013-01-12 23:27   ` Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 11/22] PCI: correctly detect ACPI PCI host bridge objects Yinghai Lu
2013-01-12 23:34   ` Rafael J. Wysocki
2013-01-13 15:32     ` Jiang Liu
2013-01-11 22:40 ` [PATCH v8 12/22] PCI, ACPI: debug print for installation of acpi root bridge's notifier Yinghai Lu
2013-01-12 23:37   ` Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 13/22] PCI, ACPI: remove acpi_root_bridge in pci_root_hp Yinghai Lu
2013-01-12 23:39   ` Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 14/22] ACPI: update ej_event interface to take acpi_device Yinghai Lu
2013-01-12 23:40   ` Rafael J. Wysocki
2013-01-15  6:55     ` Yinghai Lu
2013-01-15 11:26       ` Rafael J. Wysocki
2013-01-15 23:43         ` Yinghai Lu
2013-01-15 23:55           ` Rafael J. Wysocki
2013-01-16  0:22             ` Rafael J. Wysocki
2013-01-16  0:36               ` Yinghai Lu
2013-01-16 14:05                 ` Rafael J. Wysocki
2013-01-16 19:37                   ` Yinghai Lu
2013-01-16 21:48                     ` Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 15/22] ACPI, PCI: Simplify handle_root_bridge_removal() Yinghai Lu
2013-01-12 23:42   ` Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 16/22] PCI, acpiphp: Don't bailout even no slots found yet Yinghai Lu
2013-01-12 23:43   ` Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 17/22] PCI, ACPI: Add alloc_acpi_hp_work() Yinghai Lu
2013-01-12 23:45   ` Rafael J. Wysocki
2013-01-15  6:59     ` Yinghai Lu
2013-01-15 11:27       ` Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 18/22] PCI, acpiphp: Use acpi_hp_work Yinghai Lu
2013-01-11 22:40 ` [PATCH v8 19/22] PCI, pci_root_hp: " Yinghai Lu
2013-01-11 22:40 ` [PATCH v8 20/22] PCI, ACPI: Make kacpi_hotplug_wq static Yinghai Lu
2013-01-11 22:40 ` [PATCH v8 21/22] PCI: add match_driver in struct pci_dev Yinghai Lu
2013-01-12 23:49   ` Rafael J. Wysocki
2013-01-13 15:40     ` Jiang Liu
2013-01-13 20:01       ` Rafael J. Wysocki
2013-01-11 22:40 ` [PATCH v8 22/22] PCI: move device_add out of pci_bus_add_device() Yinghai Lu
2013-01-12 23:54   ` Rafael J. Wysocki
2013-01-15  7:10     ` Yinghai Lu
2013-01-15 11:19       ` Rafael J. Wysocki
2013-01-15 15:45         ` Yinghai Lu
2013-01-16  2:29   ` Yijing Wang
2013-01-16  2:41     ` Yinghai Lu
2013-01-12 21:35 ` [PATCH v8 00/22] PCI, ACPI: pci root bus hotplug support / pci match_driver Rafael J. Wysocki

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=1357944049-29620-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).