Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50a01337 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

PM / Domains: Fix unsafe iteration over modified list of device links 



commit c6e83cac3eda5f7dd32ee1453df2f7abb5c6cd46 upstream.

pm_genpd_remove_subdomain() iterates over domain's master_links list and
removes matching element thus it has to use safe version of list
iteration.

Fixes: f721889f ("PM / Domains: Support for generic I/O PM domains (v8)")
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 23fa7dc7

drivers/base/power/domain.c

+2 −2
Original line number Diff line number Diff line
@@ -1673,7 +1673,7 @@ int pm_genpd_add_subdomain_names(const char *master_name, 
int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,

			      struct generic_pm_domain *subdomain)

{

	struct gpd_link *link;

	struct gpd_link *l, *link;

	int ret = -EINVAL;



	if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(subdomain))
@@ -1682,7 +1682,7 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, 
 start:

	genpd_acquire_lock(genpd);



	list_for_each_entry(link, &genpd->master_links, master_node) {

	list_for_each_entry_safe(link, l, &genpd->master_links, master_node) {

		if (link->slave != subdomain)

			continue;