linux-kernel - Re: [PATCH] PCI: of: Fix memory leak when of_changeset_create

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 15 Sep 2023 10:11:46 -0700
From:   Lizhi Hou <lizhi.hou@....com>
To:     Rob Herring <robh@...nel.org>
CC:     <linux-pci@...r.kernel.org>, <devicetree@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>, <herve.codina@...tlin.com>,
        <bhelgaas@...gle.com>
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 <lizhi.hou@....com> wrote:
>> Destroy and free cset when failure happens.
>>
>> Fixes: 407d1a51921e ("PCI: Create device tree node for bridge")
>> Reported-by: Herve Codina <herve.codina@...tlin.com>
>> Closes: https://lore.kernel.org/all/20230911171319.495bb837@bootlin.com/
>> Signed-off-by: Lizhi Hou <lizhi.hou@....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 = 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
>>