The dynamic plane support means that if there's no cursor plane, then
there is no space in the pipe->planes array for it, and thus assigning
a "drm_plane-less" plane is out-of-bounds and leads to heap corruption
and later crashes.

The "drm_plane-less" cursor plane isn't included in n_planes anyway,
which means there's no way to ever access it/know that it's there - so
just remove it entirely.

Fixes: 36656239ef96 lib/igt_kms: Implement dynamic plane count support
Signed-off-by: Brian Starkey <brian.star...@arm.com>
Reviewed-by: Robert Foss <robert.f...@collabora.com>
---
 lib/igt_kms.c |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 2073a6acfa7b..60c4c260bf2d 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1692,12 +1692,6 @@ void igt_display_init(igt_display_t *display, int drm_fd)
                                memset(&pipe->planes[last_plane], 0,
                                       sizeof *plane);
                        }
-               } else {
-                       /* Add drm_plane-less cursor */
-                       plane = &pipe->planes[p];
-                       plane->pipe = pipe;
-                       plane->index = p;
-                       plane->type = DRM_PLANE_TYPE_CURSOR;
                }
 
                pipe->n_planes = n_planes;
-- 
1.7.9.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to