Mesa (master): egl/drm: 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: a9e8fb73977beaa407b72c4843e75db3b186ea09
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9e8fb73977beaa407b72c4843e75db3b186ea09

Author: Nicolas Boichat <drinkcat at chromium.org>
Date:   Thu Aug  4 10:07:53 2016 +0800

egl/drm: 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_drm.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c
index 9373496..1ce282f 100644
--- a/src/egl/drivers/dri2/platform_drm.c
+++ b/src/egl/drivers/dri2/platform_drm.c
@@ -726,5 +726,6 @@ cleanup:
       close(fd);
 
    free(dri2_dpy);
+   disp->DriverData = NULL;
    return EGL_FALSE;
 }




More information about the mesa-commit mailing list