From fbc5c5cd532962d2df96a04e5c8cc0d21b47b08a Mon Sep 17 00:00:00 2001 From: Mario Kleiner Date: Mon, 30 Apr 2018 09:06:07 +0200 Subject: dri3: Fix error handling in dri3_buffer_from_pixmap request. The old info->fd_from_pixmap() driver hook, which is preferentially used in dri3_fd_from_pixmap(), can return error codes other than -1, e.g., -EINVAL (-22) on nouveau-ddx. Not handling the error causes a broken/corrupted X-Connection resulting from a failed request. This fixes failure of sddm-greeter to start up under nouveau-ddx with DRI3 enabled and DRI3 protocol version properly clamped to 1.0 by the server (see followup patch). Fixes: 75bba3aedcb0 ("dri3: Use single-FD screen call for single-FD request") Signed-off-by: Mario Kleiner Reviewed-by: Adam Jackson Cc: Daniel Stone --- dri3/dri3_request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dri3') diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c index 8b3503611..61d3f9d05 100644 --- a/dri3/dri3_request.c +++ b/dri3/dri3_request.c @@ -255,7 +255,7 @@ proc_dri3_buffer_from_pixmap(ClientPtr client) rep.bpp = pixmap->drawable.bitsPerPixel; fd = dri3_fd_from_pixmap(pixmap, &rep.stride, &rep.size); - if (fd == -1) + if (fd < 0) return BadPixmap; if (client->swapped) { -- cgit v1.2.3