PCI: Fix reference leak in pci_register_host_bridge()

[ Upstream commit 804443c1f27883926de94c849d91f5b7d7d696e9 ]

If device_register() fails, call put_device() to give up the reference to
avoid a memory leak, per the comment at device_register().

Found by code review.

Link: https://lore.kernel.org/r/20250225021440.3130264-1-make24@iscas.ac.cn
Fixes: 37d6a0a6f470 ("PCI: Add pci_register_host_bridge() interface")
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
[bhelgaas: squash Dan Carpenter's double free fix from
https://lore.kernel.org/r/db806a6c-a91b-4e5a-a84b-6b7e01bdac85@stanley.mountain]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 8e5d818c29a9832855b077be32bec65945d74769..b7cec139d816ba0ab5e1477350d4ea720d81609e 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -885,6 +885,7 @@ 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;
@@ -948,6 +949,7 @@ 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;
 
@@ -1031,12 +1033,15 @@ 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(bus, parent);
 #endif
-       kfree(bus);
+       if (bus_registered)
+               put_device(&bus->dev);
+       else
+               kfree(bus);
+
        return err;
 }