Attachment 42339 Details for Bug 33324 – work around wrong request lengths from mesa

[patch] work around wrong request lengths from mesa

0002-glx-Work-around-wrong-request-lengths-sent-by-mesa.patch (text/plain), 2.64 KB, created by Julien Cristau on 2011-01-23 08:31:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julien Cristau

Created: 2011-01-23 08:31:27 UTC

Size: 2.64 KB

patch

obsolete

>From bbd4adb24c78ccc9ad2434fb4a410e52f29723b9 Mon Sep 17 00:00:00 2001
>From: Julien Cristau <jcristau@debian.org>
>Date: Sun, 23 Jan 2011 13:35:54 +0100
>Subject: [PATCH 2/2] glx: Work around wrong request lengths sent by mesa
>
>mesa sends too long requests for GLXDestroyPixmap, GLXDestroyWindow,
>GLXChangeDrawableAttributes and GLXGetDrawableAttributes.
>
>Fixes a regression introduced in ec9c97c6bf70b523bc500bd3adf62176f1bb33a4
>X.Org bug#33324 <https://bugs.freedesktop.org/show_bug.cgi?id=33324>
>
>Reported-by: xunx.fang@intel.com
>Signed-off-by: Julien Cristau <jcristau@debian.org>
>---
> glx/glxcmds.c |   16 +++++++++++++---
> 1 files changed, 13 insertions(+), 3 deletions(-)
>
>diff --git a/glx/glxcmds.c b/glx/glxcmds.c
>index 0b375c3..b190fa7 100644
>--- a/glx/glxcmds.c
>+++ b/glx/glxcmds.c
>@@ -1356,7 +1356,9 @@ int __glXDisp_DestroyPixmap(__GLXclientState *cl, GLbyte *pc)
>     ClientPtr client = cl->client;
>     xGLXDestroyPixmapReq *req = (xGLXDestroyPixmapReq *) pc;
> 
>-    REQUEST_SIZE_MATCH(xGLXDestroyPixmapReq);
>+    /* should be REQUEST_SIZE_MATCH, but mesa's glXDestroyPixmap sets length to
>+     * 3 instead of 2 */
>+    REQUEST_AT_LEAST_SIZE(xGLXDestroyPixmapReq);
> 
>     return DoDestroyDrawable(cl, req->glxpixmap, GLX_DRAWABLE_PIXMAP);
> }
>@@ -1498,7 +1500,13 @@ int __glXDisp_ChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
> 	client->errorValue = req->numAttribs;
> 	return BadValue;
>     }
>+#if 0
>+    /* mesa sends an additional 8 bytes */
>     REQUEST_FIXED_SIZE(xGLXChangeDrawableAttributesReq, req->numAttribs << 3);
>+#else
>+    if (((sizeof(xGLXChangeDrawableAttributesReq) + (req->numAttribs << 3)) >> 2) < client->req_len)
>+	    return BadLength;
>+#endif
> 
>     return DoChangeDrawableAttributes(cl->client, req->drawable,
> 				      req->numAttribs, (CARD32 *) (req + 1));
>@@ -1563,7 +1571,8 @@ int __glXDisp_DestroyWindow(__GLXclientState *cl, GLbyte *pc)
>     ClientPtr client = cl->client;
>     xGLXDestroyWindowReq *req = (xGLXDestroyWindowReq *) pc;
> 
>-    REQUEST_SIZE_MATCH(xGLXDestroyWindowReq);
>+    /* mesa's glXDestroyWindow sets length = 3 instead of 2 */
>+    REQUEST_AT_LEAST_SIZE(xGLXDestroyWindowReq);
> 
>     return DoDestroyDrawable(cl, req->glxwindow, GLX_DRAWABLE_WINDOW);
> }
>@@ -1864,7 +1873,8 @@ int __glXDisp_GetDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
>     ClientPtr client = cl->client;
>     xGLXGetDrawableAttributesReq *req = (xGLXGetDrawableAttributesReq *)pc;
> 
>-    REQUEST_SIZE_MATCH(xGLXGetDrawableAttributesReq);
>+    /* this should be REQUEST_SIZE_MATCH, but mesa sends an additional 4 bytes */
>+    REQUEST_AT_LEAST_SIZE(xGLXGetDrawableAttributesReq);
> 
>     return DoGetDrawableAttributes(cl, req->drawable);
> }
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 33324: 42332 | 42338 | 42339

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.