Skip to content

Commit 921b090

Browse files
sudeep-hollagregkh
authored andcommitted
pmdomain: arm: scmi: Fix genpd leak on provider registration failure
commit 7458f72 upstream. 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: 898216c ("firmware: arm_scmi: add device power domain support using genpd") Signed-off-by: Sudeep Holla <[email protected]> Reviewed-by: Peng Fan <[email protected]> Cc: [email protected] Signed-off-by: Ulf Hansson <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d9db9ab commit 921b090

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

drivers/pmdomain/arm/scmi_pm_domain.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static int scmi_pd_power_off(struct generic_pm_domain *domain)
5454

5555
static int scmi_pm_domain_probe(struct scmi_device *sdev)
5656
{
57-
int num_domains, i;
57+
int num_domains, i, ret;
5858
struct device *dev = &sdev->dev;
5959
struct device_node *np = dev->of_node;
6060
struct scmi_pm_domain *scmi_pd;
@@ -113,9 +113,18 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev)
113113
scmi_pd_data->domains = domains;
114114
scmi_pd_data->num_domains = num_domains;
115115

116+
ret = of_genpd_add_provider_onecell(np, scmi_pd_data);
117+
if (ret)
118+
goto err_rm_genpds;
119+
116120
dev_set_drvdata(dev, scmi_pd_data);
117121

118-
return of_genpd_add_provider_onecell(np, scmi_pd_data);
122+
return 0;
123+
err_rm_genpds:
124+
for (i = num_domains - 1; i >= 0; i--)
125+
pm_genpd_remove(domains[i]);
126+
127+
return ret;
119128
}
120129

121130
static void scmi_pm_domain_remove(struct scmi_device *sdev)

0 commit comments

Comments
 (0)