From 6e907812f889d34d2840feda1c3e5d182a56e1ba Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Wed, 5 Apr 2017 10:31:45 -0700 Subject: [PATCH] gbm: Assert modifiers and count are copacetic The API/entry point in mesa already checks the correct behavior, however, it's possible to be handled by another implementation and those implementations should not be able to abuse a weird combination of count and pointer. This fixes CID 1403193 Cc: Mark Janes Signed-off-by: Ben Widawsky Reviewed-by: Jason Ekstrand --- src/gbm/backends/dri/gbm_dri.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 8df6a6b..71590d7 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -1266,6 +1266,9 @@ gbm_dri_surface_create(struct gbm_device *gbm, return NULL; } + if (count) + assert(modifiers); + /* It's acceptable to create an image with INVALID modifier in the list, * but it cannot be on the only modifier (since it will certainly fail * later). While we could easily catch this after modifier creation, doing -- 2.7.4