Re: [PATCH v2 6/8] PM / Domains: Fix unsafe iteration over modified list of domains

From: Ulf Hansson
Date: Tue Jun 13 2017 - 06:39:30 EST


On 12 June 2017 at 17:17, Krzysztof Kozlowski <krzk@xxxxxxxxxx> wrote:
> of_genpd_remove_last() iterates over list of domains and removes
> matching element thus it has to use safe version of list iteration.
>
> Fixes: 17926551c98a ("PM / Domains: Add support for removing nested PM domains by provider")
> Cc: <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>

Acked-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>

> ---
> drivers/base/power/domain.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index b74b5111957a..33467beaeea4 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -1934,14 +1934,14 @@ EXPORT_SYMBOL_GPL(of_genpd_add_subdomain);
> */
> struct generic_pm_domain *of_genpd_remove_last(struct device_node *np)
> {
> - struct generic_pm_domain *gpd, *genpd = ERR_PTR(-ENOENT);
> + struct generic_pm_domain *gpd, *tmp, *genpd = ERR_PTR(-ENOENT);
> int ret;
>
> if (IS_ERR_OR_NULL(np))
> return ERR_PTR(-EINVAL);
>
> mutex_lock(&gpd_list_lock);
> - list_for_each_entry(gpd, &gpd_list, gpd_list_node) {
> + list_for_each_entry_safe(gpd, tmp, &gpd_list, gpd_list_node) {
> if (gpd->provider == &np->fwnode) {
> ret = genpd_remove(gpd);
> genpd = ret ? ERR_PTR(ret) : gpd;
> --
> 2.9.3
>