From nobody Tue Feb 10 16:18:20 2026 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28486149E0A for ; Fri, 23 Aug 2024 09:13:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.191 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404403; cv=none; b=h3zbaeSaSfs3fDlkjCJaM25bMbscTlqyYDvWIrgPz+d9UIHaZLPX7RG5y2GSG7k0PvhZRpMed4sOIB5axM5IxLr7h2Q0LJ6AbnEvn6HLrYZG5AtxDNgi9hgl/3S03jmLI1o10iy+FnPcxtERGR+iYQUBUcsEx5xozp5BEZJc8+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724404403; c=relaxed/simple; bh=+vgSRXn4RJdY9pq4gJlqkXGhpm7/U99/LmmZwCOc6+k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GNR40fDyLsSndElzGZIiAhYVzoq3vRjPy5WkNJLoelUJe8WcNbOGPhQax5fkwSIjSNzQrgEzHsH5DVgZc9i4Ajd8/AKKt3I4ihD46uMIneMHr9/sG7M2+6rb+ScaVDolC0B0VXR2/cOK3WEtRFNIf1U2R3v4dPVJCXIF3eO/lq4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.191 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4WqvVz08Fbz1j6rK; Fri, 23 Aug 2024 17:13:15 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id 9A1921402C7; Fri, 23 Aug 2024 17:13:19 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 23 Aug 2024 17:13:18 +0800 From: Jinjie Ruan To: , , , , , , , , , , , , , CC: Subject: [PATCH -next 2/5] drm/mediatek: Fix missing of_node_put() for mtk_drm_get_all_drm_priv() Date: Fri, 23 Aug 2024 17:20:50 +0800 Message-ID: <20240823092053.3170445-3-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823092053.3170445-1-ruanjinjie@huawei.com> References: <20240823092053.3170445-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemh500013.china.huawei.com (7.202.181.146) Content-Type: text/plain; charset="utf-8" In mtk_drm_get_all_drm_priv(), break in for_each_child_of_node() should call of_node_put() to avoid child node resource leak, use for_each_child_of_node_scoped() to fix it. And avoid the need for manual cleanup of_node_put() in early exits from the loop for another one. Fixes: d761b9450e31 ("drm/mediatek: Add cnt checking for coverity issue") Signed-off-by: Jinjie Ruan --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/media= tek/mtk_drm_drv.c index 77b50c56c124..41aff0183cbd 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -371,12 +371,11 @@ static bool mtk_drm_get_all_drm_priv(struct device *d= ev) struct mtk_drm_private *temp_drm_priv; struct device_node *phandle =3D dev->parent->of_node; const struct of_device_id *of_id; - struct device_node *node; struct device *drm_dev; unsigned int cnt =3D 0; int i, j; =20 - for_each_child_of_node(phandle->parent, node) { + for_each_child_of_node_scoped(phandle->parent, node) { struct platform_device *pdev; =20 of_id =3D of_match_node(mtk_drm_of_ids, node); @@ -828,7 +827,6 @@ static int mtk_drm_probe(struct platform_device *pdev) struct device_node *phandle =3D dev->parent->of_node; const struct of_device_id *of_id; struct mtk_drm_private *private; - struct device_node *node; struct component_match *match =3D NULL; struct platform_device *ovl_adaptor; int ret; @@ -869,7 +867,7 @@ static int mtk_drm_probe(struct platform_device *pdev) } =20 /* Iterate over sibling DISP function blocks */ - for_each_child_of_node(phandle->parent, node) { + for_each_child_of_node_scoped(phandle->parent, node) { const struct of_device_id *of_id; enum mtk_ddp_comp_type comp_type; int comp_id; @@ -933,10 +931,8 @@ static int mtk_drm_probe(struct platform_device *pdev) } =20 ret =3D mtk_ddp_comp_init(node, &private->ddp_comp[comp_id], comp_id); - if (ret) { - of_node_put(node); + if (ret) goto err_node; - } } =20 if (!private->mutex_node) { --=20 2.34.1