* [Nouveau] [PATCH v2 1/2] drm/nouveau/device: avoid usage of list iterator after loop
2023-03-13 13:54 [Nouveau] [PATCH v2 0/2] drm/nouveau: avoid usage of list iterator after loop Jakob Koschel
@ 2023-03-13 13:54 ` Jakob Koschel
2023-03-13 13:54 ` [Nouveau] [PATCH v2 2/2] drm/nouveau/clk: " Jakob Koschel
1 sibling, 0 replies; 3+ messages in thread
From: Jakob Koschel @ 2023-03-13 13:54 UTC (permalink / raw)
To: Ben Skeggs, Karol Herbst, Lyude Paul, David Airlie, Daniel Vetter
Cc: nouveau, Pietro Borrello, linux-kernel, dri-devel,
Cristiano Giuffrida, Bos, H.J.,
Jakob Koschel
If potentially no valid element is found, 'pstate' would contain an
invalid pointer past the iterator loop. To ensure 'pstate' is always
valid, we only set it if the correct element was found. That allows
adding a WARN_ON() in case the code works incorrectly, exposing
currently undetectable potential bugs.
Additionally, Linus proposed to avoid any use of the list iterator
variable after the loop, in the attempt to move the list iterator
variable declaration into the macro to avoid any potential misuse after
the loop [1].
Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/ [1]
Signed-off-by: Jakob Koschel <jkl820.git@gmail.com>
---
drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
index ce774579c89d..8ae14ab8f88e 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
@@ -72,7 +72,7 @@ nvkm_control_mthd_pstate_attr(struct nvkm_control *ctrl, void *data, u32 size)
} *args = data;
struct nvkm_clk *clk = ctrl->device->clk;
const struct nvkm_domain *domain;
- struct nvkm_pstate *pstate;
+ struct nvkm_pstate *pstate = NULL, *iter;
struct nvkm_cstate *cstate;
int i = 0, j = -1;
u32 lo, hi;
@@ -103,11 +103,16 @@ nvkm_control_mthd_pstate_attr(struct nvkm_control *ctrl, void *data, u32 size)
return -EINVAL;
if (args->v0.state != NVIF_CONTROL_PSTATE_ATTR_V0_STATE_CURRENT) {
- list_for_each_entry(pstate, &clk->states, head) {
- if (i++ == args->v0.state)
+ list_for_each_entry(iter, &clk->states, head) {
+ if (i++ == args->v0.state) {
+ pstate = iter;
break;
+ }
}
+ if (WARN_ON_ONCE(!pstate))
+ return -EINVAL;
+
lo = pstate->base.domain[domain->name];
hi = lo;
list_for_each_entry(cstate, &pstate->list, head) {
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Nouveau] [PATCH v2 2/2] drm/nouveau/clk: avoid usage of list iterator after loop
2023-03-13 13:54 [Nouveau] [PATCH v2 0/2] drm/nouveau: avoid usage of list iterator after loop Jakob Koschel
2023-03-13 13:54 ` [Nouveau] [PATCH v2 1/2] drm/nouveau/device: " Jakob Koschel
@ 2023-03-13 13:54 ` Jakob Koschel
1 sibling, 0 replies; 3+ messages in thread
From: Jakob Koschel @ 2023-03-13 13:54 UTC (permalink / raw)
To: Ben Skeggs, Karol Herbst, Lyude Paul, David Airlie, Daniel Vetter
Cc: nouveau, Pietro Borrello, linux-kernel, dri-devel,
Cristiano Giuffrida, Bos, H.J.,
Jakob Koschel
If potentially no valid element is found, 'pstate' would contain an
invalid pointer past the iterator loop. To ensure 'pstate' is always
valid, we only set it if the correct element was found. That allows
adding a WARN_ON() in case the code works incorrectly, exposing
currently undetectable potential bugs.
Additionally, Linus proposed to avoid any use of the list iterator
variable after the loop, in the attempt to move the list iterator
variable declaration into the macro to avoid any potential misuse after
the loop [1].
Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/ [1]
Signed-off-by: Jakob Koschel <jkl820.git@gmail.com>
---
drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 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..d914cce6d0b8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
@@ -269,14 +269,18 @@ nvkm_pstate_prog(struct nvkm_clk *clk, int pstatei)
struct nvkm_subdev *subdev = &clk->subdev;
struct nvkm_fb *fb = subdev->device->fb;
struct nvkm_pci *pci = subdev->device->pci;
- struct nvkm_pstate *pstate;
+ struct nvkm_pstate *pstate = NULL, *iter;
int ret, idx = 0;
- list_for_each_entry(pstate, &clk->states, head) {
- if (idx++ == pstatei)
+ list_for_each_entry(iter, &clk->states, head) {
+ if (idx++ == pstatei) {
+ pstate = iter;
break;
+ }
}
+ if (WARN_ON(!pstate))
+ return -EINVAL;
nvkm_debug(subdev, "setting performance state %d\n", pstatei);
clk->pstate = pstatei;
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread