linux-kernel - [PATCH -next 1/3] PCI: fix double put_device() in error case in pci_create_root

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: <20220825122753.1838930-1-yangyingliang@huawei.com>
Date:   Thu, 25 Aug 2022 20:27:51 +0800
From:   Yang Yingliang <yangyingliang@...wei.com>
To:     <linux-kernel@...r.kernel.org>, <linux-pci@...r.kernel.org>
CC:     <bhelgaas@...gle.com>
Subject: [PATCH -next 1/3] PCI: fix double put_device() in error case in pci_create_root_bus()

If device_add() fails in pci_register_host_bridge(), the brigde device will
be put once, and it will be put again in error path of pci_create_root_bus().
Move the put_device() from pci_create_root_bus() to pci_register_host_bridge()
to fix this problem. And use device_unregister() instead of del_device() and
put_device().

Fixes: 9885440b16b8 ("PCI: Fix pci_host_bridge struct device release/free handling")
Signed-off-by: Yang Yingliang <yangyingliang@...wei.com>
---
 drivers/pci/probe.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index c5286b027f00..e500eb9d6468 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1027,7 +1027,7 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
 
 unregister:
 	put_device(&bridge->dev);
-	device_del(&bridge->dev);
+	device_unregister(&bridge->dev);
 
 free:
 	kfree(bus);
@@ -3037,13 +3037,9 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
 
 	error = pci_register_host_bridge(bridge);
 	if (error < 0)
-		goto err_out;
+		return NULL;
 
 	return bridge->bus;
-
-err_out:
-	put_device(&bridge->dev);
-	return NULL;
 }
 EXPORT_SYMBOL_GPL(pci_create_root_bus);
 
-- 
2.25.1