fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gbm: Disallow INVALID modifiers returned upon image creation

Browse source 
v2: Add a TODO about modifier validation (Jason)

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Ben Widawsky 2017-03-21 11:59:51 -07:00
parent 962b31da95
commit 2a16de9e4b
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/gbm/backends/dri/gbm_dri.c
View file

@ -1143,12 +1143,29 @@ gbm_dri_bo_create(struct gbm_device *gbm,
goto failed;
}
/* 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
* the check here is a convenient debug check likely pointing at whatever
* interface the client is using to build its modifier list.
*/
if (count == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID) {
fprintf(stderr, "Only invalid modifier specified\n");
errno = EINVAL;
goto failed;
}
bo->image =
dri->image->createImageWithModifiers(dri->screen,
width, height,
dri_format,
modifiers, count,
bo);
if (bo->image) {
/* The client passed in a list of invalid modifiers */
assert(gbm_dri_bo_get_modifier(&bo->base.base) != DRM_FORMAT_MOD_INVALID);
}
} else {
bo->image = dri->image->createImage(dri->screen, width, height,
dri_format, dri_use, bo);
@ -1240,6 +1257,17 @@ gbm_dri_surface_create(struct gbm_device *gbm,
return NULL;
}
/* 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
* the check here is a convenient debug check likely pointing at whatever
* interface the client is using to build its modifier list.
*/
if (count == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID) {
fprintf(stderr, "Only invalid modifier specified\n");
errno = EINVAL;
}
surf = calloc(1, sizeof *surf);
if (surf == NULL) {
errno = ENOMEM;
@ -1263,6 +1291,10 @@ gbm_dri_surface_create(struct gbm_device *gbm,
return NULL;
}
/* TODO: We are deferring validation of modifiers until the image is actually
* created. This deferred creation can fail due to a modifier-format
* mismatch. The result is the client has a surface but no object to back it.
*/
surf->base.count = count;
memcpy(surf->base.modifiers, modifiers, count * sizeof(*modifiers));