TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-04-11 11:20:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

kmsdrm: Fix order of GBM and EGL teardown

Browse Source 
All locked front buffers must be released prior to destroying
the EGL surface to avoid causing a UAF in libnvidia-egl-gbm.so.

(cherry picked from commit 463b6be133)
This commit is contained in:
Cameron Gutman
2026-04-09 23:26:15 -05:00
committed by Sam Lantinga
parent e057712565
commit e54cc2b1fb
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/video/kmsdrm/SDL_kmsdrmvideo.c
View File

@@ -1696,17 +1696,6 @@ static void KMSDRM_DestroySurfaces(SDL_VideoDevice *_this, SDL_Window *window)
SDL_LogError(SDL_LOG_CATEGORY_VIDEO, "Could not restore CRTC");
}
/***************************/
// Destroy the EGL surface
/***************************/
SDL_EGL_MakeCurrent(_this, EGL_NO_SURFACE, EGL_NO_CONTEXT);
if (windata->egl_surface != EGL_NO_SURFACE) {
SDL_EGL_DestroySurface(_this, windata->egl_surface);
windata->egl_surface = EGL_NO_SURFACE;
}
/***************************/
// Destroy the GBM buffers
/***************************/
@@ -1723,6 +1712,17 @@ static void KMSDRM_DestroySurfaces(SDL_VideoDevice *_this, SDL_Window *window)
windata->next_bo = NULL;
}
/***************************/
// Destroy the EGL surface
/***************************/
SDL_EGL_MakeCurrent(_this, EGL_NO_SURFACE, EGL_NO_CONTEXT);
if (windata->egl_surface != EGL_NO_SURFACE) {
SDL_EGL_DestroySurface(_this, windata->egl_surface);
windata->egl_surface = EGL_NO_SURFACE;
}
/***************************/
// Destroy the GBM surface
/***************************/