From: Yang Yingliang <yangyingliang@huawei.com>
To: <linux-pci@vger.kernel.org>
Cc: <bhelgaas@google.com>, <arnd@arndb.de>, <treding@nvidia.com>,
<yangyingliang@huawei.com>
Subject: [PATCH] PCI: fix double put_device() in error case in pci_create_root_bus()
Date: Tue, 18 Oct 2022 11:51:34 +0800 [thread overview]
Message-ID: <20221018035134.2016891-1-yangyingliang@huawei.com> (raw)
If device_add() fails in pci_register_host_bridge(), the bridge device will
be put once, and it will be put again in error path of pci_create_root_bus().
Fix this by removing put_device() after device_add() is failed.
Fixes: 37d6a0a6f470 ("PCI: Add pci_register_host_bridge() interface")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/pci/probe.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index b66fa42c4b1f..f61754d76aa7 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -926,10 +926,8 @@ static int pci_register_host_bridge(struct pci_host_bridge *bridge)
/* Temporarily move resources off the list */
list_splice_init(&bridge->windows, &resources);
err = device_add(&bridge->dev);
- if (err) {
- put_device(&bridge->dev);
+ if (err)
goto free;
- }
bus->bridge = get_device(&bridge->dev);
device_enable_async_suspend(bus->bridge);
pci_set_bus_of_node(bus);
--
2.25.1
next reply other threads:[~2022-10-18 3:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 3:51 Yang Yingliang [this message]
2022-10-18 10:38 ` [PATCH] PCI: fix double put_device() in error case in pci_create_root_bus() Thierry Reding
2022-11-23 7:42 ` Yang Yingliang
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=20221018035134.2016891-1-yangyingliang@huawei.com \
--to=yangyingliang@huawei.com \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=linux-pci@vger.kernel.org \
--cc=treding@nvidia.com \
/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