On Fri, Sep 29, 2023 at 10:10:17AM -0700, Lizhi Hou wrote:
> In function of_pci_make_dev_node(), the cset needs to be destroyed and
> freed when of_changeset_create_node() returns null.
>
> 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>
Applied with Herve's Reviewed-by to for-linus for v6.6, since
407d1a51921e appeared in v6.6-rc1, thanks!
> ---
> drivers/pci/of.c | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/pci/of.c b/drivers/pci/of.c
> index 2af64bcb7da3..51e3dd0ea5ab 100644
> --- a/drivers/pci/of.c
> +++ b/drivers/pci/of.c
> @@ -657,30 +657,33 @@ void of_pci_make_dev_node(struct pci_dev *pdev)
>
> cset = kmalloc(sizeof(*cset), GFP_KERNEL);
> if (!cset)
> - goto failed;
> + goto out_free_name;
> of_changeset_init(cset);
>
> np = of_changeset_create_node(cset, ppnode, name);
> if (!np)
> - goto failed;
> - np->data = cset;
> + goto out_destroy_cset;
>
> ret = of_pci_add_properties(pdev, cset, np);
> if (ret)
> - goto failed;
> + goto out_free_node;
>
> ret = of_changeset_apply(cset);
> if (ret)
> - goto failed;
> + goto out_free_node;
>
> + np->data = cset;
> pdev->dev.of_node = np;
> kfree(name);
>
> return;
>
> -failed:
> - if (np)
> - of_node_put(np);
> +out_free_node:
> + of_node_put(np);
> +out_destroy_cset:
> + of_changeset_destroy(cset);
> + kfree(cset);
> +out_free_name:
> kfree(name);
> }
> #endif
> --
> 2.34.1
>
