diff options
| author | Ma Ke <make24@iscas.ac.cn> | 2025-02-25 10:14:40 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-20 10:18:25 +0200 |
| commit | bbba4c50a2d2a1d3f3bf31cc4b8280cb492bf2c7 (patch) | |
| tree | d4ae3aee7904b518338a47e24177ee0984c67a66 | |
| parent | 1bf3ccb3a731e1a7db1cb3d2f85d0decc0d2f26b (diff) | |
| download | linux-stable-bbba4c50a2d2a1d3f3bf31cc4b8280cb492bf2c7.tar.gz linux-stable-bbba4c50a2d2a1d3f3bf31cc4b8280cb492bf2c7.zip | |
PCI: Fix reference leak in pci_register_host_bridge()
commit 804443c1f27883926de94c849d91f5b7d7d696e9 upstream.
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/pci/probe.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 961760bb2d96..ed4a11f4445b 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -910,6 +910,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; @@ -973,6 +974,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; @@ -1059,12 +1061,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(parent, bus->domain_nr); #endif - kfree(bus); + if (bus_registered) + put_device(&bus->dev); + else + kfree(bus); + return err; } |