Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
Received-SPF: Pass (protection.outlook.com: domain of amd.com designates
 165.204.84.17 as permitted sender) receiver=protection.outlook.com;
 client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C
Message-ID: <ebdc4295-f9ee-7e5f-2616-10f7567054ec@amd.com>
Date:   Fri, 15 Sep 2023 10:11:46 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH] PCI: of: Fix memory leak when of_changeset_create_node()
 failed
Content-Language: en-US
To:     Rob Herring <robh@kernel.org>
CC:     <linux-pci@vger.kernel.org>, <devicetree@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <herve.codina@bootlin.com>,
        <bhelgaas@google.com>
References: <1694715351-58279-1-git-send-email-lizhi.hou@amd.com>
 <CAL_JsqLLfTONAA4XPsQdYC0XL-F0jmMhaz_mmr_uTCOf6SqOqQ@mail.gmail.com>
From:   Lizhi Hou <lizhi.hou@amd.com>
In-Reply-To: <CAL_JsqLLfTONAA4XPsQdYC0XL-F0jmMhaz_mmr_uTCOf6SqOqQ@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2023 17:11:53.0235
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 57ba5076-8548-4c89-dfbf-08dbb60edb82
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com]
X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000989EC.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8775
X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 15 Sep 2023 10:12:41 -0700 (PDT)


On 9/15/23 09:20, Rob Herring wrote:
> On Thu, Sep 14, 2023 at 1:16 PM 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 = 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
>>