XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

glxmor/glamor_egl: Move glamor_egl_close_screen to the post screen close hook

Browse Source 
We want drivers' close screen hooks to be called before glamor's close screen
hook, because they may have gbm bo's created with glamor's gbm device.
If we free the gbm device before the driver frees all gbm bo's, then the
drivers could have an use-after-free when freeing the bo's.

This fixes a memory leak, since before this change, we were just
leaking everything glamor mapped to a screen, not freeing EGLImages,
gbm devices, etc.

Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2026-03-25 23:10:51 +02:00
committed by Enrico Weigelt
parent 2027509a86
commit 1530c7de53
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dix/screen_hooks_priv.h
View File

@@ -157,7 +157,10 @@ void dixScreenUnhookClose(ScreenPtr pScreen,
* proc had been called.
*
* When registration fails, the server aborts.
*
* NOTE: only exported for libglamoregl, not supposed to be used by drivers.
**/
_X_EXPORT
void dixScreenHookPostClose(ScreenPtr pScreen,
XorgScreenCloseProcPtr func);
@@ -174,7 +177,10 @@ void dixScreenHookPostClose(ScreenPtr pScreen,
*
* In contrast to Close hook, it's called *after* the driver's CloseScreen()
* proc had been called.
*
* NOTE: only exported for libglamoregl, not supposed to be used by drivers.
**/
_X_EXPORT
void dixScreenUnhookPostClose(ScreenPtr pScreen,
XorgScreenCloseProcPtr func);

6
glamor/glamor_egl.c
View File

@@ -976,7 +976,9 @@ static void glamor_egl_close_screen(CallbackListPtr *pcbl, ScreenPtr screen, voi
eglDestroyImageKHR(glamor_egl->display, pixmap_priv->image);
pixmap_priv->image = NULL;
dixScreenUnhookClose(screen, glamor_egl_close_screen);
glamor_egl_cleanup(glamor_egl);
dixScreenUnhookPostClose(screen, glamor_egl_close_screen);
dixScreenUnhookPixmapDestroy(screen, glamor_egl_pixmap_destroy);
}
@@ -1055,7 +1057,7 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
#endif
const char *gbm_backend_name;
dixScreenHookClose(screen, glamor_egl_close_screen);
dixScreenHookPostClose(screen, glamor_egl_close_screen);
dixScreenHookPixmapDestroy(screen, glamor_egl_pixmap_destroy);
glamor_ctx->ctx = glamor_egl->context;