Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
MIME-Version: 1.0
References: <1694715351-58279-1-git-send-email-lizhi.hou@amd.com>
In-Reply-To: <1694715351-58279-1-git-send-email-lizhi.hou@amd.com>
From:   Rob Herring <robh@kernel.org>
Date:   Fri, 15 Sep 2023 11:20:13 -0500
Message-ID: <CAL_JsqLLfTONAA4XPsQdYC0XL-F0jmMhaz_mmr_uTCOf6SqOqQ@mail.gmail.com>
Subject: Re: [PATCH] PCI: of: Fix memory leak when of_changeset_create_node() failed
To:     Lizhi Hou <lizhi.hou@amd.com>
Cc:     linux-pci@vger.kernel.org, devicetree@vger.kernel.org,
        linux-kernel@vger.kernel.org, herve.codina@bootlin.com,
        bhelgaas@google.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Thu, Sep 14, 2023 at 1:16=E2=80=AFPM Lizhi Hou <lizhi.hou@amd.com> wrote=
:
>
> Destroy and free cset when failure happens.
>
> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> Reported-by: Herve Codina <herve.codina@bootlin.com>
> Closes: https://lore.kernel.org/all/20230911171319.495bb837@bootlin.com/
> Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
> ---
>  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 =3D of_changeset_create_node(cset, ppnode, name);
>         if (!np)
>                 goto failed;
> -       np->data =3D cset;
>
>         ret =3D 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 =3D cset;
>         pdev->dev.of_node =3D 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
>