From patchwork Fri Apr 6 15:31:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 151195 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 083E9B6FFA for ; Sat, 7 Apr 2012 01:31:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754854Ab2DFPb4 (ORCPT ); Fri, 6 Apr 2012 11:31:56 -0400 Received: from mail-pz0-f52.google.com ([209.85.210.52]:56404 "EHLO mail-pz0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754233Ab2DFPbz (ORCPT ); Fri, 6 Apr 2012 11:31:55 -0400 Received: by dake40 with SMTP id e40so2883836dak.11 for ; Fri, 06 Apr 2012 08:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=UkjOvdFck8o6Aj1daJad4JoP7oU9uK8kuT/SfKF4fcQ=; b=f7Ke169hQFxgjJZfY3o65QgUVTqsLMthb5lbAuzUMcG4HEjUAOzacY9hHMtpPUH94k 1IKx6ectUx5k+BIxCsLq+973kDqHwiMbBuAlkYHWBWL9w8kudbOwejgvyaCL6Py8s0hI aXGnDg84ayUhFaZmtV5P/WghixmNFEeukvrK2FwZlxPjM+zG1qQDY9ROfQxX8IiU+0d0 4aRDnsFdhTdT7lE2+naTyJrwBeu3klI0yc6EnZHSmYhrLtCij+4S3vProtd6ZPUcp9be vp+1sV/y5m7b81DHoGW/fQt7Le2zn/oxlnhgW+cJp7TrujnAqtilhMWSIr3EVE8ZjZ3e YSBQ== Received: by 10.68.221.10 with SMTP id qa10mr16296559pbc.139.1333726315200; Fri, 06 Apr 2012 08:31:55 -0700 (PDT) Received: from localhost.localdomain ([163.125.15.8]) by mx.google.com with ESMTPS id d2sm6557660pbw.39.2012.04.06.08.31.49 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 Apr 2012 08:31:54 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Yinghai Lu Cc: Jiang Liu , Keping Chen , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] PCI: Fix a device reference count leakage issue in pci_dev_present() Date: Fri, 6 Apr 2012 23:31:36 +0800 Message-Id: <1333726296-3817-1-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.5.4 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 --- drivers/pci/search.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/pci/search.c b/drivers/pci/search.c index 9d75dc8..b572730 100644 --- a/drivers/pci/search.c +++ b/drivers/pci/search.c @@ -338,13 +338,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);