Mesa (master): egl/surfaceless: Set disp->DriverData to NULL on error
Emil Velikov
evelikov at kemper.freedesktop.org
Mon Aug 15 18:04:29 UTC 2016
Module: Mesa
Branch: master
Commit: 0e67d86540cb5f6bedffe4ff5dfcb1070e76b28b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e67d86540cb5f6bedffe4ff5dfcb1070e76b28b
Author: Nicolas Boichat <drinkcat at chromium.org>
Date: Thu Aug 4 10:07:52 2016 +0800
egl/surfaceless: Set disp->DriverData to NULL on error
Avoid use-after-free on error.
Fixes: 9ee683f877 (egl/dri2: Add reference count for dri2_egl_display)
Cc: "12.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Nicolas Boichat <drinkcat at chromium.org>
Tested-by: Martin Peres <martin.peres at linux.intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
---
src/egl/drivers/dri2/platform_surfaceless.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c
index 8ce6162..e0d383b 100644
--- a/src/egl/drivers/dri2/platform_surfaceless.c
+++ b/src/egl/drivers/dri2/platform_surfaceless.c
@@ -362,6 +362,7 @@ cleanup_driver:
close(dri2_dpy->fd);
cleanup_display:
free(dri2_dpy);
+ disp->DriverData = NULL;
return _eglError(EGL_NOT_INITIALIZED, err);
}
More information about the mesa-commit
mailing list