Module: Mesa Branch: master Commit: 9a1eb5423722955bee5c5b5f48fb058f0884fab0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a1eb5423722955bee5c5b5f48fb058f0884fab0
Author: Chuanbo Weng <chuanbo.w...@intel.com> Date: Tue Sep 6 17:28:43 2016 +0800 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: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Chuanbo Weng <chuanbo.w...@intel.com> Reviewed-by: Emil Velikov <emil.veli...@collabora.com> --- src/gbm/backends/dri/gbm_dri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index c1f9d62..0ab67da 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); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit