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:   Wang Ming <machel@vivo.com>
To:     Sunil Goutham <sgoutham@marvell.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     opensource.kernel@vivo.com, simon.horman@corigine.com,
        Wang Ming <machel@vivo.com>
Subject: [PATCH net v2] net:thunder:Fix resource leaks in device_for_each_child_node() loops
Date:   Thu,  6 Jul 2023 20:30:11 +0800
Message-Id: <20230706123021.8174-1-machel@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/+ENYQlq4vZqpEoY8XQtclwCgBw3BtabJJ9bLg8GexHcH1cBAu/GerJ9QS/l?=
 =?us-ascii?Q?ZnqXsSPIx5N0Oyl+XyJLW/qV9Ibk7O0GPmKD33kK82XUVc1pHk5eTIG2YU/P?=
 =?us-ascii?Q?0AvKaJpBHKiacGqUU8unAorOD17HzhhxHsbKZs+gjFsXfQ216m5EItIEn6dR?=
 =?us-ascii?Q?1sDxApywonHhJkXjg49rOA1FnKt44H5jLikUZF0ukV/IAX89faenT4jk12hv?=
 =?us-ascii?Q?ltAXUCTUy/uQk+KZXLi8ofzivtznUn1qsh1IQKFjwKmqsH18YEt09CWLSSpo?=
 =?us-ascii?Q?U6yoKLIqHEbTyg0j6m3e+LhIkMVvufmrjmTVsdg/Hm0cpwdZGhidO90gjlPk?=
 =?us-ascii?Q?hSEsTnqC+54zPTbHbEziDATnRVyT5/XHsuMKq9i8pTx/3vOKShQ8HY0bYi0d?=
 =?us-ascii?Q?cZk0DWTUO6HiH11337kIRDXg8Q1WWM33DYArr7cYp2rRMdJr1jwaf6rdr1u1?=
 =?us-ascii?Q?RCi5hXrZVRLsDDWrcoUv7DHH7e7pmAXq+C70GOfNR6Ljkio/eKnT6a74dAmR?=
 =?us-ascii?Q?FarRfHQzzc4/6X+kzIEWuzI2/9faYbAvkGogauknrJBDYDg7cN7L2iuBGnVV?=
 =?us-ascii?Q?BYpEULIfgd0yY/RKychWcNtIAaUWDFhsNjZbapffEMjDIf96UDX60TVRwAVF?=
 =?us-ascii?Q?L0OKdkGz1h5u3xD17c2OFDQ5BdOXnsboNiANHOfo2mDnG+PnSUuPyOlmQCl1?=
 =?us-ascii?Q?f9agIK/i3mLRq5rYg+PAiyW7mGzMf/whNQHBO26d4rhq8sFxYpk0wwoC+Psz?=
 =?us-ascii?Q?03igAVrdwzfdzG3/H/BLhJAzNK1pV6VJOhYXw2TOzHSYC7wa6lf+nF33sOTx?=
 =?us-ascii?Q?yjNaymmRL6TvkjmG+H6EoEg3QHgNtcTrXUqaRjui1oenHuS1NdDqLSWCN4Yq?=
 =?us-ascii?Q?rV8Cq9sY4nBoJXo0ohFcVAgjwlNC2lCD0K9M4z2xcW/G/6qtd4MdECzwr3W7?=
 =?us-ascii?Q?djgXXzQYkRPTMLQYFYZyOSYSVoAWxEkuJsSx5A/UUDmTFnXpgxjLa/5FjXQi?=
 =?us-ascii?Q?VqMTU++F8DRBht3zUFW61JfGVSrKYd8Q3dQj7Sp9sCAaf1fmZ5BUrP36DjGb?=
 =?us-ascii?Q?Tw5Wvhf/J4R69nXJR+4wjLLpRQKlIBYh6+U/38rA7MZcK95C57Drpm1PDX4N?=
 =?us-ascii?Q?QXdtDAo6C/ni8pmF2yQ8/KxTmKkAb3zjTSb7e/CUrp146+nx4eWu1oVFw4bj?=
 =?us-ascii?Q?5RBwWt2MrrMjPaWytX74qP0NxpwZmZVEEA4ZZYhIAk9m7wHIC+jYLDv3tylf?=
 =?us-ascii?Q?AhfWgfRfH+lpteP+A7tJ3FHbcNllHkodkSJO7CcaxZfHi4O2xTYgLSXRj552?=
 =?us-ascii?Q?1oR0HB/bijywD7aX0QpR5MTB17F3wUJDhUdXCvYjRu+RL4c6Xg6Tutm3hb4N?=
 =?us-ascii?Q?lJ+ODDwS9IgmpFA2Uh9Lpypv5IkOaqYV1cDk+b+ALMzhT4e7b6ma24e18AJ7?=
 =?us-ascii?Q?ov/dvbbkwjGz286zw2SHVWrKmbb8c6wZiXvn+RMhoFoaUN0n+iRwWI345WFC?=
 =?us-ascii?Q?Dz/LMlG6MYPaIg+62W9/qudPwNxup+PpzTfsRYMx2VR/2p/Cs+LYaClbXtT2?=
 =?us-ascii?Q?eJkEOFxLjlAmddnajR0r/hcH5Ux6OVwlUV1JQACT?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 00908a29-bd7a-40f9-b0e8-08db7e1cccf5
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB3743.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2023 12:30:36.8338
 (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: T65pgBu4O7gACO28Hld3YbQA3Yr7xnf8pwirb0euStlnO9wi6eGyU2HJrVY3gHTU4uTJfRAK4X9WxyuJNIeqjQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB5558
X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=no 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

The device_for_each_child_node() loop in
bgx_init_of_phy() function should have
fwnode_handle_put() before break
which could avoid resource leaks.
This patch could fix this bug.

Signed-off-by: Wang Ming <machel@vivo.com>
---
 drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index a317feb8decb..f8a8b2ab72aa 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -1469,6 +1469,7 @@ static int bgx_init_of_phy(struct bgx *bgx)
 	struct fwnode_handle *fwn;
 	struct device_node *node = NULL;
 	u8 lmac = 0;
+	int err = 0;
 
 	device_for_each_child_node(&bgx->pdev->dev, fwn) {
 		struct phy_device *pd;
@@ -1479,7 +1480,7 @@ static int bgx_init_of_phy(struct bgx *bgx)
 		 */
 		node = to_of_node(fwn);
 		if (!node)
-			break;
+			goto out_handle_put;
 
 		of_get_mac_address(node, bgx->lmac[lmac].mac);
 
@@ -1501,10 +1502,8 @@ static int bgx_init_of_phy(struct bgx *bgx)
 		}
 
 		lmac++;
-		if (lmac == bgx->max_lmac) {
-			of_node_put(node);
-			break;
-		}
+		if (lmac == bgx->max_lmac)
+			goto out_node_put;
 	}
 	return 0;
 
@@ -1519,8 +1518,12 @@ static int bgx_init_of_phy(struct bgx *bgx)
 		}
 		lmac--;
 	}
+	err = -EPROBE_DEFER;
+out_node_put:
 	of_node_put(node);
-	return -EPROBE_DEFER;
+out_handle_put:
+	fwnode_handle_put(fwn);
+	return err;
 }
 
 #else
-- 
2.25.1