From 9a1eb5423722955bee5c5b5f48fb058f0884fab0 Mon Sep 17 00:00:00 2001 From: Chuanbo Weng Date: Tue, 6 Sep 2016 17:28:43 +0800 Subject: gbm: fix potential NULL deref of mapImage/unmapImage. The mapImage/unmapImage functions of DRIimage extension can be NULL, so we should add additional check for them. Cc: Signed-off-by: Chuanbo Weng Reviewed-by: Emil Velikov --- src/gbm/backends/dri/gbm_dri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gbm/backends/dri/gbm_dri.c') diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index c1f9d62d366..0ab67dad210 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -949,7 +949,7 @@ gbm_dri_bo_map(struct gbm_bo *_bo, return *map_data; } - if (!dri->image || dri->image->base.version < 12) { + if (!dri->image || dri->image->base.version < 12 || !dri->image->mapImage) { errno = ENOSYS; return NULL; } @@ -980,7 +980,8 @@ gbm_dri_bo_unmap(struct gbm_bo *_bo, void *map_data) return; } - if (!dri->context || !dri->image || dri->image->base.version < 12) + if (!dri->context || !dri->image || + dri->image->base.version < 12 || !dri->image->unmapImage) return; dri->image->unmapImage(dri->context, bo->image, map_data); -- cgit v1.2.3