Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Lu Hongfei <luhongfei@vivo.com>
To:     Mauro Carvalho Chehab <mchehab@kernel.org>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        AngeloGioacchino Del Regno 
        <angelogioacchino.delregno@collabora.com>,
        Hans Verkuil <hverkuil-cisco@xs4all.nl>,
        Moudy Ho <moudy.ho@mediatek.com>,
        Ping-Hsun Wu <ping-hsun.wu@mediatek.com>,
        daoyuan huang <daoyuan.huang@mediatek.com>,
        Arnd Bergmann <arnd@arndb.de>, Lu Hongfei <luhongfei@vivo.com>,
        Sun Ke <sunke32@huawei.com>,
        linux-media@vger.kernel.org (open list:MEDIA INPUT INFRASTRUCTURE
        (V4L/DVB)),
        linux-kernel@vger.kernel.org (open list:ARM/Mediatek SoC support),
        linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC
        support),
        linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC
        support)
Cc:     opensource.kernel@vivo.com
Subject: [PATCH v3] media: platform: mtk-mdp3: Fix resource leak in mdp_get_subsys_id() and mdp_comp_config()
Date:   Tue, 13 Jun 2023 11:27:27 +0800
Message-Id: <20230613032734.34099-1-luhongfei@vivo.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SjZDVXB1cWZVZmEzWFdaMlEvSXdCb3VZdmYvUWFOak9pRzBTcksrKy94eDdj?=
 =?utf-8?B?T3BvQnRRYTdkU1N0ZFNPd3diNkR2VDUxY05uSHVwaXdkNG4ybXBwd2xBYVBM?=
 =?utf-8?B?V0d2Zy9IcUhFc1p5WmI3eHBGeklQS1FNQ2psL3lLbUt1eGdndEFXdk81SERW?=
 =?utf-8?B?OGxRaHN5KzVyZlU5eGNOYmlBU0EvYXNSNUM0Zk9ONFRkSm1mK0M3dmlxZUo3?=
 =?utf-8?B?dndjajVsU2graDFSVzlKRlpESDc0Z0x5K1NNMit0WC9KaDA5K0lKbzRZZExl?=
 =?utf-8?B?YmRYR1BLYzUxb29xMXVneXB0RTBWMy9udE9kMFpUNzJySHJjTEdwbTYxcHhK?=
 =?utf-8?B?alBCQ3lOVVdCckVHQ2hZcWhCejZTeDdZT2t1cVpJU1RqNlgxN1FTZEsweXBS?=
 =?utf-8?B?c3JKd254bFYzMnhWOG5zR3o5OGFzMW9KYWh6SXIreTdGaUsrTHhkalA4QTVD?=
 =?utf-8?B?a3lhdXVpZzlOQXh2eFBmSUl3aDR6ZERaTTBZcHFwbC9ZNHA2cjRDRGo2VEZ1?=
 =?utf-8?B?aVRramxDQnA3RWxCWHYyaWszeGtRQjJvdE1SYlFhVjRqZVd2cUpGKzByWVIr?=
 =?utf-8?B?enFzNHJjQzJFRENRRFVUTzJselB2U3V6SE5LQXFKZ1FvRUZtbUFUaGlFRGJ0?=
 =?utf-8?B?Z25WVzN1b0xFM1BrK3NtOThqZEpSME1adXRFNWNvZU96UmN2ZnJXdTEyajVv?=
 =?utf-8?B?U290eTVzL0hUM0t0cDFWQU9nbE45MXk5MjV1TklRM3pkZFdPTDJuY1dwY0wv?=
 =?utf-8?B?bWk5dVltck41Q1NkYUdSUHYzVHljMmNSbE1IbCtGQUFiOW1OdE13OTVTMWZW?=
 =?utf-8?B?Q2x5eVJ2T2hKR3Q3UXFCZzk2YURoOUtjL0tMUFhBeHNteFA5R3FzL2JhSEdJ?=
 =?utf-8?B?N2wxRGJHQk5wQ0dDMUZsSVBuR0gxU0dWUzYzelE0NjVHcytYbjl3OUxsSGJM?=
 =?utf-8?B?djRtb2FLQkpicGRmWWErS2F5bmx4Q0Q0L1FLOUY1UFYrTjhzQmtEMDRERlQv?=
 =?utf-8?B?M3BNN0hCdktaazlJUksyMklTeWlYSUgweEF0SWY2TXFnVlVwZ2owMGZWbkdy?=
 =?utf-8?B?VmUxMkNETnQyKzdWMGR3RWk0aWxNVllhK1B5MkVIWTBHN0FZODNSK3dxSWo2?=
 =?utf-8?B?VXBrRXpaV2srelJIb3NlVmdmNlI1aU5IL3A4S0ltQWlrR2VZb2t5YnR0MkVq?=
 =?utf-8?B?UEo2d2NJT2owaG9aNnZzakVCQUJCTkN0STlkVitvdGVDVHhZY05SNHE4TkVV?=
 =?utf-8?B?NzVKczJsdHdqdU5iaWtPQmtqVHJvUitpWitjZmRPMDdySTMyK2NSVll4ZW9O?=
 =?utf-8?B?d1FveUhQbmhoekEydEVCYmYzZHp4eGZRcnl4WWNPYko3cWx4M0dvUU04Y2NB?=
 =?utf-8?B?MkFFcmhCN2JVY0I1bWZtb3dLMXg1SXliZUdCQWRCY3ArK2xvcXBTZ2JvWmRU?=
 =?utf-8?B?LzNWd29xUjVMOEtRM1ZEeTRpL0dPMk96MHhwZHhBKzU0TmV0azJ4cHhVSkVT?=
 =?utf-8?B?VHFCckJZMFo5RVVHSVpCczdKWGhndWVERG1GOE9XQmVVZldZTTZ2dENtNTQz?=
 =?utf-8?B?eFFXYUdkZnE0ZG9WK1VxYU9iZWtzd1Y4dzBGL2J6aDBWZmg4T0w0WXF5ZFRX?=
 =?utf-8?B?T05Ba2RsQ0VEM0lNNHcwN0NyUXVTWTR5NDU1UmhMbXllazlSbXRseFNZMHM1?=
 =?utf-8?B?czEwRTNhY3RjMG15QkRVTkh2K2hxUFM5bExpSkREZkdDWlhaeHRLRnBPeVB0?=
 =?utf-8?B?bk96d1NKcS9DOFhLbkpOOEh5TXV6UXdLN2wxMFBUMXFlZWcrVzMyb3ZXMktT?=
 =?utf-8?B?ZFcwWXBVL2ZOcGVqVXRKRG5Xa1FPR3ZJY1BMUERHbUJPbzFhcEthcmxsOGgy?=
 =?utf-8?B?V2l1UDkzajVsaUViOXp2U0Fsc29UcjZwVmJhMTVNMGVwYUdpUS9LSWlzRE4r?=
 =?utf-8?B?ditseGd2WmNUcWJwWVZrMmNZVTlXTTRYaUtIbklCQmlPWjlpdm1JY3hJekZ4?=
 =?utf-8?B?TzBERGw0UUVORGQvRkZyYkZXU0tpTGx5bHFJZHBwdWNmZ3pjVnNsSmdLcTVI?=
 =?utf-8?B?eUhyUS9Wd1Y3aVZ4Y0xrdFpETDJlaWlPeXRYaHQ0emttODZxdDhwSjNjQ01p?=
 =?utf-8?Q?eeCFNntvsNg0aXeolNOsZg6aY?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c8a1b838-2e80-47a4-47df-08db6bbe2751
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB6697.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2023 03:27:45.2570
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: RJrAr029fggGnG9K5YWhoIUoIoTZLmewBBiflsALQi950ADr7H9i3WKhAZwek1HkhRJeTiw2kILFz7UD1dsXqA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB5966
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add a put_device() call for the release of the object
which was determined by a of_find_device_by_node() call
in mdp_get_subsys_id().

Add of_node_put() call for the release of the object
which was determined by a for_each_child_of_node() call
in mdp_comp_config().

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
The previous version’s Subject was:
[PATCH v2] media: platform: mtk-mdp3: Fix resource leaks in mdp_get_subsys_id()

The modifications made compared to the previous version are as follows:
1. Modified the patch subject
2. Fix resource leak issue in mdp_comp_config()

 drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
index a605e80c7dc3..85c5f89f2ed2
--- a/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
+++ b/drivers/media/platform/mediatek/mdp3/mtk-mdp3-comp.c
@@ -892,13 +892,16 @@ static int mdp_get_subsys_id(struct mdp_dev *mdp, struct device *dev,
 	ret = cmdq_dev_get_client_reg(&comp_pdev->dev, &cmdq_reg, index);
 	if (ret != 0) {
 		dev_err(&comp_pdev->dev, "cmdq_dev_get_subsys fail!\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto put_device;
 	}
 
 	comp->subsys_id = cmdq_reg.subsys;
 	dev_dbg(&comp_pdev->dev, "subsys id=%d\n", cmdq_reg.subsys);
 
-	return 0;
+put_device:
+	put_device(&comp_pdev->dev);
+	return ret;
 }
 
 static void __mdp_comp_init(struct mdp_dev *mdp, struct device_node *node,
@@ -1135,6 +1138,7 @@ int mdp_comp_config(struct mdp_dev *mdp)
 		comp = mdp_comp_create(mdp, node, id);
 		if (IS_ERR(comp)) {
 			ret = PTR_ERR(comp);
+			of_node_put(node);
 			goto err_init_comps;
 		}
 
@@ -1144,6 +1148,8 @@ int mdp_comp_config(struct mdp_dev *mdp)
 		pm_runtime_enable(comp->comp_dev);
 	}
 
+	of_node_put(node);
+
 	ret = mdp_comp_sub_create(mdp);
 	if (ret)
 		goto err_init_comps;
-- 
2.39.0