2018-03-05 10:19:17

by Jeffy Chen

Subject: [PATCH] soc: rockchip: power-domain: Add a sanity check on pd->num_clks

The of_count_phandle_with_args() can fail and return error(for example,
rk3399 pd_vio doesn't have clocks). That would break the pd probe.

Add a sanity check on pd->num_clks to avoid that.

Fixes: 65084121d59d ("soc: rockchip: power-domain: use clk_bulk APIs")
Reported-by: Shawn Lin <[email protected]>
Signed-off-by: Jeffy Chen <[email protected]>
---

drivers/soc/rockchip/pm_domains.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
index ad96ddeaeb78..fd58fd475950 100644
--- a/drivers/soc/rockchip/pm_domains.c
+++ b/drivers/soc/rockchip/pm_domains.c
@@ -402,11 +402,16 @@ static int rockchip_pm_add_one_domain(struct rockchip_pmu *pmu,

pd->num_clks = of_count_phandle_with_args(node, "clocks",
"#clock-cells");
-
- pd->clks = devm_kcalloc(pmu->dev, pd->num_clks, sizeof(*pd->clks),
- GFP_KERNEL);
- if (!pd->clks)
- return -ENOMEM;
+ if (pd->num_clks > 0) {
+ pd->clks = devm_kcalloc(pmu->dev, pd->num_clks,
+ sizeof(*pd->clks), GFP_KERNEL);
+ if (!pd->clks)
+ return -ENOMEM;
+ } else {
+ dev_dbg(pmu->dev, "%s: don't have clocks: %d\n",
+ node->name, pd->num_clks);
+ pd->num_clks = 0;
+ }

for (i = 0; i < pd->num_clks; i++) {
pd->clks[i].clk = of_clk_get(node, i);
--
2.11.0

2018-03-05 10:22:50

by Shawn Lin

Subject: Re: [PATCH] soc: rockchip: power-domain: Add a sanity check on pd->num_clks

Hi Jeffy,

On 2018/3/5 17:17, Jeffy Chen wrote:
> The of_count_phandle_with_args() can fail and return error(for example,
> rk3399 pd_vio doesn't have clocks). That would break the pd probe.
>
> Add a sanity check on pd->num_clks to avoid that.
>
> Fixes: 65084121d59d ("soc: rockchip: power-domain: use clk_bulk APIs")
> Reported-by: Shawn Lin <[email protected]>
> Signed-off-by: Jeffy Chen <[email protected]>
Tested-by: Shawn Lin <[email protected]>

2018-03-05 20:29:02

by Heiko Stuebner

Subject: Re: [PATCH] soc: rockchip: power-domain: Add a sanity check on pd->num_clks

Am Montag, 5. M?rz 2018, 10:17:22 CET schrieb Jeffy Chen:
> The of_count_phandle_with_args() can fail and return error(for example,
> rk3399 pd_vio doesn't have clocks). That would break the pd probe.
>
> Add a sanity check on pd->num_clks to avoid that.
>
> Fixes: 65084121d59d ("soc: rockchip: power-domain: use clk_bulk APIs")
> Reported-by: Shawn Lin <[email protected]>
> Signed-off-by: Jeffy Chen <[email protected]>

applied for 4.17


Thanks
Heiko