frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor_egl: handle fd export failure in glamor_egl_fds_from_pixmap 

Check the fd for validity before giving a success return code.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Simon Ser <contact@emersion.fr>
Tested-by: Guido Günther <agx@sigxcpu.org>
This commit is contained in:
Lucas Stach 2022-07-28 22:52:15 +02:00 committed by Michel Dänzer
parent 7d5ad2d372
commit 95944e2b99
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glamor/glamor_egl.c
View File

@ -417,6 +417,11 @@ glamor_egl_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
num_fds = gbm_bo_get_plane_count(bo); num_fds = gbm_bo_get_plane_count(bo);
for (i = 0; i < num_fds; i++) { for (i = 0; i < num_fds; i++) {
fds[i] = gbm_bo_get_fd(bo); fds[i] = gbm_bo_get_fd(bo);
if (fds[i] == -1) {
while (--i >= 0)
close(fds[i]);
return 0;
}
strides[i] = gbm_bo_get_stride_for_plane(bo, i); strides[i] = gbm_bo_get_stride_for_plane(bo, i);
offsets[i] = gbm_bo_get_offset(bo, i); offsets[i] = gbm_bo_get_offset(bo, i);
} }
@ -424,6 +429,8 @@ glamor_egl_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
#else #else
num_fds = 1; num_fds = 1;
fds[0] = gbm_bo_get_fd(bo); fds[0] = gbm_bo_get_fd(bo);
if (fds[0] == -1)
return 0;
strides[0] = gbm_bo_get_stride(bo); strides[0] = gbm_bo_get_stride(bo);
offsets[0] = 0; offsets[0] = 0;
*modifier = DRM_FORMAT_MOD_INVALID; *modifier = DRM_FORMAT_MOD_INVALID;