diff options
| author |   Krzysztof Kozlowski <krzk@kernel.org> | 2017-06-28 16:56:20 +0200 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-29 01:24:35 +0200 |
| commit | a7e2d1bce4c1db471f1cbc0c4666a3112bbf0994 (patch) | |
| tree | 027a5fc7eb8f295345a96073c818a50cbbe5ced3 /drivers/base | |
| parent | PM / Domains: Fix unsafe iteration over modified list of domain providers (diff) | |
| download | linux-dev-a7e2d1bce4c1db471f1cbc0c4666a3112bbf0994.tar.xz linux-dev-a7e2d1bce4c1db471f1cbc0c4666a3112bbf0994.zip | |
PM / Domains: Fix unsafe iteration over modified list of domains
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: 4.9+ <stable@vger.kernel.org> # 4.9+
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/domain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 0b836fdc99ad..e342408cfb8d 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1980,14 +1980,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; |