PCI: tegra: Fix OF node reference leak
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Tue, 4 May 2021 17:17:42 +0000 (19:17 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Sep 2021 10:28:00 +0000 (12:28 +0200)
[ Upstream commit eff21f5da308265678e7e59821795e606f3e560f ]

Commit 9e38e690ace3 ("PCI: tegra: Fix OF node reference leak") has fixed
some node reference leaks in this function but missed some of them.

In fact, having 'port' referenced in the 'rp' structure is not enough to
prevent the leak, until 'rp' is actually added in the 'pcie->ports' list.

Add the missing 'goto err_node_put' accordingly.

Link: https://lore.kernel.org/r/55b11e9a7fa2987fbc0869d68ae59888954d65e2.1620148539.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Vidya Sagar <vidyas@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pci/controller/pci-tegra.c

index 1a2af963599ca069b3c35d564a9b18a69930e004..b4eb75f25906e25e2f6a5a53059fa2a31ef9082c 100644 (file)
@@ -2160,13 +2160,15 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie)
                rp->np = port;
 
                rp->base = devm_pci_remap_cfg_resource(dev, &rp->regs);
-               if (IS_ERR(rp->base))
-                       return PTR_ERR(rp->base);
+               if (IS_ERR(rp->base)) {
+                       err = PTR_ERR(rp->base);
+                       goto err_node_put;
+               }
 
                label = devm_kasprintf(dev, GFP_KERNEL, "pex-reset-%u", index);
                if (!label) {
-                       dev_err(dev, "failed to create reset GPIO label\n");
-                       return -ENOMEM;
+                       err = -ENOMEM;
+                       goto err_node_put;
                }
 
                /*
@@ -2184,7 +2186,8 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie)
                        } else {
                                dev_err(dev, "failed to get reset GPIO: %ld\n",
                                        PTR_ERR(rp->reset_gpio));
-                               return PTR_ERR(rp->reset_gpio);
+                               err = PTR_ERR(rp->reset_gpio);
+                               goto err_node_put;
                        }
                }