Skip to contentSkip to conversation

kms_atomic: drop unnecessary connector looping from plane_primary test

PATCH In review Matt Roper 2 participants 3 messages Feb 26, 2016

lore
Share & tools
lore

Matt Roper

author
#0 lore raw

PATCH 1/1 kms_atomic: drop unnecessary connector looping from plane_primary test

Local variable num_connectors is never initialized before being auto-incremented in the loop. If we wind up with a non-zero garbage value, it will lead us to try to write to an out-of-bounds array index. We should probably initialize it to zero before use.

However on closer inspection, the plane_primary test doesn't actually wind up using the connector list or number of connectors, so just remove the whole block of code; it was probably brought in by accident as part of a copy-paste operation.

---
 tests/kms_atomic.c | 12 ------------
 1 file changed, 12 deletions(-)
tests/kms_atomic.c +0 -12
index c8b8b78..2f3080a 100644
@@ -909,19 +909,7 @@ static void plane_primary(struct kms_atomic_crtc_state *crtc,
 	struct kms_atomic_plane_state plane = *plane_old;
 	uint32_t format = plane_get_igt_format(&plane);
 	drmModeAtomicReq *req = drmModeAtomicAlloc();
-	uint32_t *connectors;
-	int num_connectors;
 	struct igt_fb fb;
-	int i;
-
-	connectors = calloc(crtc->state->num_connectors, sizeof(*connectors));
-	igt_assert(connectors);
-
-	for (i = 0; i < crtc->state->num_connectors; i++) {
-		if (crtc->state->connectors[i].crtc_id == crtc->obj)
-			connectors[num_connectors++] =
-				crtc->state->connectors[i].obj;
-	}
 
 	igt_require(format != 0);
 
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 6 lines · Matt Roper

Local variable num_connectors is never initialized before being auto-incremented in the loop.  If we wind up with a non-zero garbage value, it will lead us to try to write to an out-of-bounds array index.
We should probably initialize it to zero before use.

Quoted 6 lines

However on closer inspection, the plane_primary test doesn't actually wind up using the connector list or number of connectors, so just remove
the whole block of code; it was probably brought in by accident as part
of a copy-paste operation.

History rather than copy & paste; originally crtc_commit_*() was inlined. But the rest of your analysis is totally correct; thanks for finding this!

Cheers,
Daniel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author
#2 lore raw
Quoted 16 lines · Daniel Stone

Hi,

Quoted 6 lines · Matt Roper

Local variable num_connectors is never initialized before being auto-incremented in the loop.  If we wind up with a non-zero garbage value, it will lead us to try to write to an out-of-bounds array index.
We should probably initialize it to zero before use.

Quoted 6 lines

However on closer inspection, the plane_primary test doesn't actually wind up using the connector list or number of connectors, so just remove
the whole block of code; it was probably brought in by accident as part
of a copy-paste operation.

Quoted 5 lines

History rather than copy & paste; originally crtc_commit_*() was inlined. But the rest of your analysis is totally correct; thanks for finding this!

Thanks for the speedy review! Pushed to fdo.

Matt

Signature · 9 lines
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx