linux-kernel - [PATCH] Revert "PCI: Fix reference leak in pci_register_host

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250410032842.246396-1-liwei728@huawei.com>
Date: Thu, 10 Apr 2025 11:28:42 +0800
From: Xiangwei Li <liwei728@...wei.com>
To: <make24@...as.ac.cn>, <bhelgaas@...gle.com>
CC: <linux-kernel@...r.kernel.org>, <linux-pci@...r.kernel.org>,
	<liwei728@...wei.com>, <bobo.shaobowang@...wei.com>,
	<wangxiongfeng2@...wei.com>
Subject: [PATCH] Revert "PCI: Fix reference leak in pci_register_host_bridge()"

This reverts commit 804443c1f27883926de94c849d91f5b7d7d696e9.

The newly added logic incorrectly sets bus_registered to true even when
device_register returns an error, this is incorrect.

When device_register fails, there is no need to release the reference count,
and there are no direct error-handling operations following its execution.

Therefore, this patch is meaningless and should be reverted.

Fixes: 804443c1f278 ("PCI: Fix reference leak in pci_register_host_bridge()")
Signed-off-by: Xiangwei Li <liwei728@...wei.com>
Signed-off-by: Xiongfeng Wang <wangxiongfeng2@...wei.com>
---
 drivers/pci/probe.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 364fa2a514f8..8595d41add09 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -957,7 +957,6 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
 	resource_size_t offset, next_offset;
 	LIST_HEAD(resources);
 	struct resource *res, *next_res;
-	bool bus_registered = false;
 	char addr[64], *fmt;
 	const char *name;
 	int err;
@@ -1021,7 +1020,6 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
 	name = dev_name(&bus->dev);
 
 	err = device_register(&bus->dev);
-	bus_registered = true;
 	if (err)
 		goto unregister;
 
@@ -1110,15 +1108,12 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
 unregister:
 	put_device(&bridge->dev);
 	device_del(&bridge->dev);
+
 free:
 #ifdef CONFIG_PCI_DOMAINS_GENERIC
 	pci_bus_release_domain_nr(parent, bus->domain_nr);
 #endif
-	if (bus_registered)
-		put_device(&bus->dev);
-	else
-		kfree(bus);
-
+	kfree(bus);
 	return err;
 }
 
-- 
2.25.1