2023-09-15 00:35:56

by Lizhi Hou

Subject: [PATCH] PCI: of: Fix memory leak when of_changeset_create_node() failed

Destroy and free cset when failure happens.

Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
Reported-by: Herve Codina <[email protected]>
Closes: https://lore.kernel.org/all/[email protected]/
Signed-off-by: Lizhi Hou <[email protected]>
---
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) {
+ of_changeset_destroy(cset);
+ kfree(cset);
+ }
if (np)
of_node_put(np);
kfree(name);
--
2.34.1

2023-09-15 12:33:29

by Herve Codina

Subject: Re: [PATCH] PCI: of: Fix memory leak when of_changeset_create_node() failed

Hi Lizhi

On Thu, 14 Sep 2023 11:15:51 -0700
Lizhi Hou <[email protected]> wrote:

> Destroy and free cset when failure happens.
>
> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> Reported-by: Herve Codina <[email protected]>
> Closes: https://lore.kernel.org/all/[email protected]/
> Signed-off-by: Lizhi Hou <[email protected]>
> ---
> 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

Why this patch alone ?
The issue fixed by this patch is related to the patch 2 in a series under review
https://lore.kernel.org/linux-kernel/ZQGaSr+G5qu%[email protected]/
Is the patch 2 in this series already applied by some maintainers ?

You have to fix the patch in the series sending a new iteration of the series.

This patch alone does not make sense.

Otherwise, the modifications to fix the issue seem good.

Regards,
Hervé

> --- 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) {
> + of_changeset_destroy(cset);
> + kfree(cset);
> + }
> if (np)
> of_node_put(np);
> kfree(name);

2023-09-15 16:34:48

by Rob Herring (Arm)

Subject: Re: [PATCH] PCI: of: Fix memory leak when of_changeset_create_node() failed

On Thu, Sep 14, 2023 at 1:16 PM Lizhi Hou <[email protected]> wrote:
>
> Destroy and free cset when failure happens.
>
> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
> Reported-by: Herve Codina <[email protected]>
> Closes: https://lore.kernel.org/all/[email protected]/
> Signed-off-by: Lizhi Hou <[email protected]>
> ---
> 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
>

2023-09-15 18:15:06

by Lizhi Hou

Subject: Re: [PATCH] PCI: of: Fix memory leak when of_changeset_create_node() failed

On 9/15/23 00:04, Herve Codina wrote:
> Hi Lizhi
>
> On Thu, 14 Sep 2023 11:15:51 -0700
> Lizhi Hou <[email protected]> wrote:
>
>> Destroy and free cset when failure happens.
>>
>> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
>> Reported-by: Herve Codina <[email protected]>
>> Closes: https://lore.kernel.org/all/[email protected]/
>> Signed-off-by: Lizhi Hou <[email protected]>
>> ---
>> 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
> Why this patch alone ?
> The issue fixed by this patch is related to the patch 2 in a series under review
> https://lore.kernel.org/linux-kernel/ZQGaSr+G5qu%[email protected]/
> Is the patch 2 in this series already applied by some maintainers ?
Yes.
>
> You have to fix the patch in the series sending a new iteration of the series.
>
> This patch alone does not make sense.
>
> Otherwise, the modifications to fix the issue seem good.
>
> Regards,
> Hervé
>
>> --- 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) {
>> + of_changeset_destroy(cset);
>> + kfree(cset);
>> + }
>> if (np)
>> of_node_put(np);
>> kfree(name);

2023-09-15 20:52:36

by Lizhi Hou

Subject: Re: [PATCH] PCI: of: Fix memory leak when of_changeset_create_node() failed

On 9/15/23 09:20, Rob Herring wrote:
> On Thu, Sep 14, 2023 at 1:16 PM Lizhi Hou <[email protected]> wrote:
>> Destroy and free cset when failure happens.
>>
>> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
>> Reported-by: Herve Codina <[email protected]>
>> Closes: https://lore.kernel.org/all/[email protected]/
>> Signed-off-by: Lizhi Hou <[email protected]>
>> ---
>> 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.

Ok. I will create another patch to use multiple goto labels.


Lizhi

>
>> + of_changeset_destroy(cset);
>> + kfree(cset);
>> + }
>> if (np)
>> of_node_put(np);
>> kfree(name);
>> --
>> 2.34.1
>>