From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5C3C52E6CD3 for ; Fri, 21 Nov 2025 15:43:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763739784; cv=none; b=lptqD4ZOG5OELgr/J1s/yEHyao2eIOjfVEtHMecEHiKkCAfKFmtj+FxAzv6bTr45lFms01vBZ3qqcWf1s8aSdU1/O3QwfJVDiwybj/X+Z4qFNOZVP7Z+kO5MyWytXxgohCiSsXYtsynkRSuy1jzMV/pkKQ+dUmXNY4WJ29BMnT8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763739784; c=relaxed/simple; bh=C9N9r060PujhlvGtHWUgKktJZ0Dykf25kePWPYfKRs0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VP1g7GzcVBwyNXFFkjKYGn/IXFEvV+1NSUjZhm3iQc9/QiDU5apF1uMMnEFcVkmyTr627qSIFT5wlApRhilTeZmUyyxcES7jaNZ6xKUyeP3tlctx1HBagP98x3QsGD3JbsNNAmUxQdvcxyy2/6LzunNYXgOTbadTQG4icR3Sgtw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nc3AWAyZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nc3AWAyZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33208C4CEF1; Fri, 21 Nov 2025 15:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763739783; bh=C9N9r060PujhlvGtHWUgKktJZ0Dykf25kePWPYfKRs0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nc3AWAyZD2rq9Km6NEzYCVvy662TW+Igge2lg6ckQCf/hjlcXH5X0H8pEf0e3/r1l 2FafxFMnECiMSb59Xk1phDT3Xvh9AyjN2cAcSOVCeVFo0OEo8d8y9yrolXODx7AXdu HS3pxK3uYxpgo7qq5U14dCSVvB+NGxRB9/9qfLYMjLe7ljuNoTu+MmYRHcVCKG4B9g FslbU35iZ5+z6We+ZUn+FaxCciCMLp1xNCmZkQw59DorHqk3EWTnrhZdTcbOG6jvVd wl54MOCMNZ5t4RWrMpOmFxWA7S3mDhMbTzbBZwZJpq7v/ElEWTxOyc+XleOOEVaMxM esQMum7SXv/Ww== From: Sasha Levin To: stable@vger.kernel.org Cc: Sudeep Holla , Peng Fan , Ulf Hansson , Sasha Levin Subject: [PATCH 6.6.y] pmdomain: arm: scmi: Fix genpd leak on provider registration failure Date: Fri, 21 Nov 2025 10:43:01 -0500 Message-ID: <20251121154301.2580293-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025112052-bulldozer-hatbox-e9df@gregkh> References: <2025112052-bulldozer-hatbox-e9df@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sudeep Holla [ Upstream commit 7458f72cc28f9eb0de811effcb5376d0ec19094a ] If of_genpd_add_provider_onecell() fails during probe, the previously created generic power domains are not removed, leading to a memory leak and potential kernel crash later in genpd_debug_add(). Add proper error handling to unwind the initialized domains before returning from probe to ensure all resources are correctly released on failure. Example crash trace observed without this fix: | Unable to handle kernel paging request at virtual address fffffffffffffc70 | CPU: 1 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.18.0-rc1 #405 PREEMPT | Hardware name: ARM LTD ARM Juno Development Platform/ARM Juno Development Platform | pstate: 00000005 (nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) | pc : genpd_debug_add+0x2c/0x160 | lr : genpd_debug_init+0x74/0x98 | Call trace: | genpd_debug_add+0x2c/0x160 (P) | genpd_debug_init+0x74/0x98 | do_one_initcall+0xd0/0x2d8 | do_initcall_level+0xa0/0x140 | do_initcalls+0x60/0xa8 | do_basic_setup+0x28/0x40 | kernel_init_freeable+0xe8/0x170 | kernel_init+0x2c/0x140 | ret_from_fork+0x10/0x20 Fixes: 898216c97ed2 ("firmware: arm_scmi: add device power domain support using genpd") Signed-off-by: Sudeep Holla Reviewed-by: Peng Fan Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson [ drivers/pmdomain/arm/scmi_pm_domain.c -> drivers/firmware/arm_scmi/scmi_pm_domain.c ] Signed-off-by: Sasha Levin --- drivers/firmware/arm_scmi/scmi_pm_domain.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_scmi/scmi_pm_domain.c b/drivers/firmware/arm_scmi/scmi_pm_domain.c index 0e05a79de82d8..82d923a9d75d7 100644 --- a/drivers/firmware/arm_scmi/scmi_pm_domain.c +++ b/drivers/firmware/arm_scmi/scmi_pm_domain.c @@ -54,7 +54,7 @@ static int scmi_pd_power_off(struct generic_pm_domain *domain) static int scmi_pm_domain_probe(struct scmi_device *sdev) { - int num_domains, i; + int num_domains, i, ret; struct device *dev = &sdev->dev; struct device_node *np = dev->of_node; struct scmi_pm_domain *scmi_pd; @@ -112,9 +112,18 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) scmi_pd_data->domains = domains; scmi_pd_data->num_domains = num_domains; + ret = of_genpd_add_provider_onecell(np, scmi_pd_data); + if (ret) + goto err_rm_genpds; + dev_set_drvdata(dev, scmi_pd_data); - return of_genpd_add_provider_onecell(np, scmi_pd_data); + return 0; +err_rm_genpds: + for (i = num_domains - 1; i >= 0; i--) + pm_genpd_remove(domains[i]); + + return ret; } static void scmi_pm_domain_remove(struct scmi_device *sdev) -- 2.51.0