Dan Carpenter
2022-Aug-11 06:39 UTC
[Nouveau] [PATCH] drm/nouveau/clk: fix end of loop test in nvkm_clk_ustate_update()
If list_for_each_entry() exits without hitting a break then "pstate"
is not a valid pstate pointer. Introduce a "found" variable instead.
Fixes: 7c8565220697 ("drm/nouveau/clk: implement power state and engine
clock control in core")
Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
---
There were a couple other places where there is no error handling which
also led to similar warnings. It wasn't clear why the error handling
was not needed there.
drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c:111
nvkm_control_mthd_pstate_attr() warn: iterator used outside loop:
'pstate'
drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c:283 nvkm_pstate_prog() warn:
iterator used outside loop: 'pstate'
net/xfrm/xfrm_ipcomp.c:246 ipcomp_free_tfms() warn: iterator used outside loop:
'pos'
drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
index da07a2fbef06..33f073ab3c49 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
@@ -473,6 +473,7 @@ static int
nvkm_clk_ustate_update(struct nvkm_clk *clk, int req)
{
struct nvkm_pstate *pstate;
+ bool found = false;
int i = 0;
if (!clk->allow_reclock)
@@ -480,12 +481,14 @@ nvkm_clk_ustate_update(struct nvkm_clk *clk, int req)
if (req != -1 && req != -2) {
list_for_each_entry(pstate, &clk->states, head) {
- if (pstate->pstate == req)
+ if (pstate->pstate == req) {
+ found = true;
break;
+ }
i++;
}
- if (pstate->pstate != req)
+ if (!found)
return -EINVAL;
req = i;
}
--
2.35.1