From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C48D4C433FE for ; Mon, 21 Nov 2022 06:07:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229677AbiKUGHQ (ORCPT ); Mon, 21 Nov 2022 01:07:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229379AbiKUGHN (ORCPT ); Mon, 21 Nov 2022 01:07:13 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E39A52A969; Sun, 20 Nov 2022 22:07:11 -0800 (PST) Received: from kwepemi500024.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NFxjZ5VvrzRpHG; Mon, 21 Nov 2022 14:06:42 +0800 (CST) Received: from [10.174.179.163] (10.174.179.163) by kwepemi500024.china.huawei.com (7.221.188.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 21 Nov 2022 14:07:08 +0800 Message-ID: <9ec55a8e-5ce4-6846-f88d-2d9b33a34bc9@huawei.com> Date: Mon, 21 Nov 2022 14:07:08 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.1.2 Subject: Re: [PATCH v2] of: overlay: fix memory leak in add_changeset_node() Content-Language: en-US To: , , Frank Rowand , , , CC: , , Linux Kernel Mailing List References: <20221121035335.809316-1-zengheng4@huawei.com> From: Zeng Heng In-Reply-To: <20221121035335.809316-1-zengheng4@huawei.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.163] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500024.china.huawei.com (7.221.188.100) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org +cc linux-kernel-mail-list On 2022/11/21 11:53, Zeng Heng wrote: > When of_changeset_attach_node() returns fail and tchild is > over of life cycle which is duplicated by __of_node_dup(), > it needs to call of_node_put() to release tchild in > error handle route. > > Otherwise, there are some memory leak reported about the node: > > unreferenced object 0xffff88810cd1e800 (size 256): > backtrace: > kmalloc_trace > __of_node_dup > add_changeset_node (inlined) > build_changeset_next_level > > unreferenced object 0xffff888113721240 (size 16): > backtrace: > __kmalloc_node_track_caller > kstrdup > __of_node_dup > add_changeset_node (inlined) > build_changeset_next_level > > unreferenced object 0xffff88810a38d400 (size 128): > backtrace: > kmalloc_trace > __of_prop_dup > add_changeset_property > build_changeset_next_level > > Fixes: 0290c4ca2536 ("of: overlay: rename identifiers to more reflect what they do") > Signed-off-by: Zeng Heng > --- > drivers/of/overlay.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c > index bd8ff4df723d..a5189a0ec0a3 100644 > --- a/drivers/of/overlay.c > +++ b/drivers/of/overlay.c > @@ -436,8 +436,10 @@ static int add_changeset_node(struct overlay_changeset *ovcs, > of_node_set_flag(tchild, OF_OVERLAY); > > ret = of_changeset_attach_node(&ovcs->cset, tchild); > - if (ret) > + if (ret) { > + of_node_put(tchild); > return ret; > + } > > target_child.np = tchild; > target_child.in_livetree = false;