On Thu, Sep 14, 2023 at 1:16 PM Lizhi Hou <lizhi.hou@xxxxxxx> wrote:
>
> Destroy and free cset when failure happens.
>
> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> Reported-by: Herve Codina <herve.codina@xxxxxxxxxxx>
> Closes: https://lore.kernel.org/all/20230911171319.495bb837@xxxxxxxxxxx/
> Signed-off-by: Lizhi Hou <lizhi.hou@xxxxxxx>
> ---
> drivers/pci/of.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/of.c b/drivers/pci/of.c
> index 2af64bcb7da3..67bbfa2fca59 100644
> --- a/drivers/pci/of.c
> +++ b/drivers/pci/of.c
> @@ -663,7 +663,6 @@ void of_pci_make_dev_node(struct pci_dev *pdev)
> np = of_changeset_create_node(cset, ppnode, name);
> if (!np)
> goto failed;
> - np->data = cset;
>
> ret = of_pci_add_properties(pdev, cset, np);
> if (ret)
> @@ -673,12 +672,17 @@ void of_pci_make_dev_node(struct pci_dev *pdev)
> if (ret)
> goto failed;
>
> + np->data = cset;
> pdev->dev.of_node = np;
> kfree(name);
>
> return;
>
> failed:
> + if (cset) {
Instead of adding more if's, use multiple goto labels which is the
normal cleanup style. Note that there's a new cleanup.h thing that can
do some automatic cleanups. Not sure if that works or helps here.
> + of_changeset_destroy(cset);
> + kfree(cset);
> + }
> if (np)
> of_node_put(np);
> kfree(name);
> --
> 2.34.1
>
