pmdomain: core: Fix error checking in genpd_dev_pm_attach_by_id()

[ Upstream commit 0f5757667ec0aaf2456c3b76fcf0c6c3ea3591fe ]

The error checking for of_count_phandle_with_args() does not handle
negative error codes correctly.  The problem is that "index" is a u32 so
in the condition "if (index >= num_domains)" negative error codes stored
in "num_domains" are type promoted to very high positive values and
"index" is always going to be valid.

Test for negative error codes first and then test if "index" is valid.

Fixes: 3ccf3f0cd197 ("PM / Domains: Enable genpd_dev_pm_attach_by_id|name() for single PM domain")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/aBxPQ8AI8N5v-7rL@stanley.mountain
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index f5a032b6b8d694be05992cbfa3ca61159430ac11..7a76f0c53f545133ec4f58ba35cc5d7e6b49346c 100644 (file)
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2676,7 +2676,7 @@ struct device *genpd_dev_pm_attach_by_id(struct device *dev,
        /* Verify that the index is within a valid range. */
        num_domains = of_count_phandle_with_args(dev->of_node, "power-domains",
                                                 "#power-domain-cells");
-       if (index >= num_domains)
+       if (num_domains < 0 || index >= num_domains)
                return NULL;
 
        /* Allocate and register device on the genpd bus. */