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:     Andy Gross <agross@kernel.org>,
        Bjorn Andersson <andersson@kernel.org>,
        Konrad Dybcio <konrad.dybcio@linaro.org>,
        linux-arm-msm@vger.kernel.org (open list:ARM/QUALCOMM SUPPORT),
        linux-kernel@vger.kernel.org (open list)
Cc:     opensource.kernel@vivo.com, luhongfei@vivo.com
Subject: [PATCH v3] soc: qcom: pmic: Fix resource leaks in a device_for_each_child_node() loop
Date:   Mon, 12 Jun 2023 21:34:52 +0800
Message-Id: <20230612133452.47315-1-luhongfei@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?CTpY7sKILZ6IQTnGD1gAyjsgt/iOYhWGtxJMag7TRzaDVE5pxOFri8t4Jt55?=
 =?us-ascii?Q?qf58AQwtKzNf5BLHb82RPKZOs9c3boInDhJSud4EBLYvJ4VtQb/BIUlQ75gd?=
 =?us-ascii?Q?pIZHXX2TN2d8tlhgCV8Vnvndk/xAQYgASgfLr+N9Lu1WXB9J40YyewKd5sXG?=
 =?us-ascii?Q?goIOrqQtMB2EL1BvDi3bLqumxMDvVRmOvuwiPyJiyWBuQY3LExLyolzCENdx?=
 =?us-ascii?Q?Uaj1oB85TSVCLZFkQnH1JOxTDsy3+4LFKoEVydkaJMRL5FhIjSd7wqiU/6W+?=
 =?us-ascii?Q?JdovgUIeQgVLebnxgVLpkAChNBvT/Dg38tf86tIMZbkhAKtESJFDoZS/yiMq?=
 =?us-ascii?Q?qC37X+1tXR0Zk0c99tpdcm89+C/0yqkkRRloTDGCJFRqAqiiZH8r3tBqOXLi?=
 =?us-ascii?Q?pLY4Ykpe5TKrwaolbxiFtQqu5Y/PHDzXooZquUNTIL0T38apgtG3YqxMXOou?=
 =?us-ascii?Q?tB5B+TiW0eJ4LpyXwPKat4PUBu51P12JS8NLDYr24H6PJt/+ROWk8T3iCbcF?=
 =?us-ascii?Q?2qvvnMASYWT3sRzhJc2tXtAorhQ2D4r2KlDxcGVnJnjIclMRqmOf6fqLIJul?=
 =?us-ascii?Q?rxOCwt1q5aNLF4yA9PLhxbI4qnjG90zoagVg2G/4TBgkXc6En0Ba+almpGAt?=
 =?us-ascii?Q?kS4xPDi0T0u2fqUaXjt3+mtWnzuZ/99acSw9fKujQaMicWiniwmLMZyMYfy0?=
 =?us-ascii?Q?n7PB4y7z7+eMCfBWmadd9epPIM870xwND1c3Lgj2iS56LXvpKvXerPSR7YTH?=
 =?us-ascii?Q?4fc+NUzS5hXIdL18MQwzov/xpjg50glf787m3DX4GYDGyL9GqXoWymw0Ip8G?=
 =?us-ascii?Q?iZMzI9H750LAy68DBhdDLj6K5rzRpVvma820dZ1P6EaFdzV1goesDW+PqFb/?=
 =?us-ascii?Q?+Z08SW6cEBbs+ZQCOZ1guwsflqifbQJ92XQpXbcMlnKjwKyPAghcnvdAPGu8?=
 =?us-ascii?Q?gPxsoH0qVj3/MuXs/HTngd7H6q6xKB9znG2uGJLYnbxBo22DGnPHitGXeS1i?=
 =?us-ascii?Q?M8wPaqrc+ZHOXHEmKm51iGe1QIwlUwVQ59oa6fRISWv2UJ8KqMyTv+OYl5h+?=
 =?us-ascii?Q?isZbdYHHMnqqyYjZ90hb24IsGnPQcVhagVBCyir6iiqDR/QrzhVHgVB0wtEH?=
 =?us-ascii?Q?9QhEtNTAbpmfxdk1pHZzAxXRQNOTowhirBGBfbQbpL9JLEHyqLEQZhvNjb9B?=
 =?us-ascii?Q?q84aS0GTMDAZbnD+UndXMs+APSu0DLwvk1DKNlCoIFT3o5xwvXmXLfupOro8?=
 =?us-ascii?Q?erGuepk7pi8BCf55Gg4/xUu/7JvgcKFC/hZAYkoIBp+GB0atu4wltU5aeAMV?=
 =?us-ascii?Q?1KqUkyvoS6h1LCYyNjE+syDLdMXpM6bmz8EdO10tI79+BfidmZF+Uldsg7s2?=
 =?us-ascii?Q?+bAa6guBYGIW4tSb0RN7V/45bTcvj0wSaiHGX8DIwnQ+L/J7tjlxR9zbDfoS?=
 =?us-ascii?Q?g6Cd5luSAYQVF6vGqlWcl3q+I0b4qBqbeOw8caaim/TJ4BxG+PrO0ImZope1?=
 =?us-ascii?Q?bhrQqXexktlaolLeaBkwfISjOJ+xttQ4SdnA48PlHWmn8QrWE6JJYwf/5Vsm?=
 =?us-ascii?Q?JXwIj3xVNZivirWUAbMMBRsEW/AubTFjUEkXq7QF?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ee456492-187e-408c-4380-08db6b49d2b1
X-MS-Exchange-CrossTenant-AuthSource: TYZPR06MB6697.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2023 13:35:02.0066
 (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: HALHv4ZiuGZ2sQEmPpXSulHIfzcFwxhshB746sTYmdnF/OH4v5jQPgkbnZvLCici62jzVrla78BwmBIstLdazw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4177
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
        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

The device_for_each_child_node loop should call fwnode_handle_put()
before return in some error cases, which could avoid resource leaks.

Let's fix this bug in pmic_glink_altmode_probe.

Signed-off-by: Lu Hongfei <luhongfei@vivo.com>
---
The modifications made compared to the previous version are as follows:
1. Modified the patch title
2. Modified the commit message to make it easier to understand
   patch's modifications.

 drivers/soc/qcom/pmic_glink_altmode.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/drivers/soc/qcom/pmic_glink_altmode.c b/drivers/soc/qcom/pmic_glink_altmode.c
index df48fbea4b68..a7fc6570fa1e 100644
--- a/drivers/soc/qcom/pmic_glink_altmode.c
+++ b/drivers/soc/qcom/pmic_glink_altmode.c
@@ -395,7 +395,7 @@ static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
 		ret = fwnode_property_read_u32(fwnode, "reg", &port);
 		if (ret < 0) {
 			dev_err(dev, "missing reg property of %pOFn\n", fwnode);
-			return ret;
+			goto err_node_put;
 		}
 
 		if (port >= ARRAY_SIZE(altmode->ports)) {
@@ -405,7 +405,8 @@ static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
 
 		if (altmode->ports[port].altmode) {
 			dev_err(dev, "multiple connector definition for port %u\n", port);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto err_node_put;
 		}
 
 		alt_port = &altmode->ports[port];
@@ -420,33 +421,37 @@ static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
 
 		ret = devm_drm_bridge_add(dev, &alt_port->bridge);
 		if (ret)
-			return ret;
+			goto err_node_put;
 
 		alt_port->dp_alt.svid = USB_TYPEC_DP_SID;
 		alt_port->dp_alt.mode = USB_TYPEC_DP_MODE;
 		alt_port->dp_alt.active = 1;
 
 		alt_port->typec_mux = fwnode_typec_mux_get(fwnode);
-		if (IS_ERR(alt_port->typec_mux))
-			return dev_err_probe(dev, PTR_ERR(alt_port->typec_mux),
+		if (IS_ERR(alt_port->typec_mux)) {
+			ret = dev_err_probe(dev, PTR_ERR(alt_port->typec_mux),
 					     "failed to acquire mode-switch for port: %d\n",
 					     port);
+			goto err_node_put;
+		}
 
 		ret = devm_add_action_or_reset(dev, pmic_glink_altmode_put_mux,
 					       alt_port->typec_mux);
 		if (ret)
-			return ret;
+			goto err_node_put;
 
 		alt_port->typec_switch = fwnode_typec_switch_get(fwnode);
-		if (IS_ERR(alt_port->typec_switch))
-			return dev_err_probe(dev, PTR_ERR(alt_port->typec_switch),
+		if (IS_ERR(alt_port->typec_switch)) {
+			ret = dev_err_probe(dev, PTR_ERR(alt_port->typec_switch),
 					     "failed to acquire orientation-switch for port: %d\n",
 					     port);
+			goto err_node_put;
+		}
 
 		ret = devm_add_action_or_reset(dev, pmic_glink_altmode_put_switch,
 					       alt_port->typec_switch);
 		if (ret)
-			return ret;
+			goto err_node_put;
 	}
 
 	altmode->client = devm_pmic_glink_register_client(dev,
@@ -455,6 +460,10 @@ static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
 							  pmic_glink_altmode_pdr_notify,
 							  altmode);
 	return PTR_ERR_OR_ZERO(altmode->client);
+
+err_node_put:
+	fwnode_handle_put(fwnode);
+	return ret;
 }
 
 static const struct auxiliary_device_id pmic_glink_altmode_id_table[] = {
-- 
2.39.0