40 patches, fixing several X.Org CVEs in NX.

* Security fixes:
  - Rebase loads of X.Org patches (mainly from RHEL-5) against NX. If not
    all patches from a CVE patch series appear here, then it means that
    the affected file/code is not used in NX at build time.
  - X.Org CVE-2011-2895:
      1001-LZW-decompress-fix-for-CVE-2011-2895-From-xorg-lib-X.patch
  - X.Org CVE-2011-4028:
      1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.-ups.patch
  - X.Org CVE-2013-4396:
      1003-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch
  - X.Org CVE-2013-6462:
      1004-CVE-2013-6462-unlimited-sscanf-overflows-stack-buffe.patch
  - X.Org CVE-2014-0209:
      1005-CVE-2014-0209-integer-overflow-of-realloc-size-in-Fo.patch
      1006-CVE-2014-0209-integer-overflow-of-realloc-size-in-le.patch
  - X.Org CVE-2014-0210:
      1007-CVE-2014-0210-unvalidated-length-in-_fs_recv_conn_se.patch
      1009-CVE-2014-0210-unvalidated-lengths-when-reading-repli.patch
      1011-CVE-2014-0210-unvalidated-length-fields-in-fs_read_q.patch
      1014-CVE-2014-0210-unvalidated-length-fields-in-fs_read_e.patch
      1015-CVE-2014-0210-unvalidated-length-fields-in-fs_read_g.patch
      1016-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch
      1017-CVE-2014-0210-unvalidated-length-fields-in-fs_read_l.patch
  - X.Org CVE-2014-0211:
      1010-CVE-2014-0211-Integer-overflow-in-fs_get_reply-_fs_s.patch
      1012-CVE-2014-0211-integer-overflow-in-fs_read_extent_inf.patch
      1013-CVE-2014-0211-integer-overflow-in-fs_alloc_glyphs-fr.patch
      1018-unchecked-malloc-may-allow-unauthed-client-to-crash-.patch
  - X.Org CVE-2014-8092:
      1019-dix-integer-overflow-in-ProcPutImage-CVE-2014-8092-1.patch
      1020-dix-integer-overflow-in-GetHosts-CVE-2014-8092-2-4.patch
      1021-dix-integer-overflow-in-RegionSizeof-CVE-2014-8092-3.patch
      1022-dix-integer-overflow-in-REQUEST_FIXED_SIZE-CVE-2014-.patch
  - X.Org CVE-2014-8097:
      1023-dbe-unvalidated-lengths-in-DbeSwapBuffers-calls-CVE-.patch
  - X.Org CVE-2014-8095:
      1024-Xi-unvalidated-lengths-in-Xinput-extension-CVE-2014-.patch
  - X.Org CVE-2014-8096:
      1025-xcmisc-unvalidated-length-in-SProcXCMiscGetXIDList-C.patch
  - X.Org CVE-2014-8099:
      1026-Xv-unvalidated-lengths-in-XVideo-extension-swapped-p.patch
  - X.Org CVE-2014-8100:
      1027-render-check-request-size-before-reading-it-CVE-2014.patch
      1028-render-unvalidated-lengths-in-Render-extn.-swapped-p.patch
  - X.Org CVE-2014-8102:
      1029-xfixes-unvalidated-length-in-SProcXFixesSelectSelect.patch
  - X.Org CVE-2014-8101:
      1030-randr-unvalidated-lengths-in-RandR-extension-swapped.patch
  - X.Org CVE-2014-8093:
      1031-glx-Be-more-paranoid-about-variable-length-requests-.patch
      1032-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch
      1033-glx-Additional-paranoia-in-__glXGetAnswerBuffer-__GL.patch
      1034-glx-Add-safe_-add-mul-pad-v3-CVE-2014-8093-4-6-v4.patch
      1036-glx-Integer-overflow-protection-for-non-generated-re.patch
  - X.Org CVE-2014-8098:
      1035-glx-Length-checking-for-GLXRender-requests-v2-CVE-20.patch
      1037-glx-Top-level-length-checking-for-swapped-VendorPriv.patch
      1038-glx-Length-checking-for-non-generated-single-request.patch
      1039-glx-Length-checking-for-RenderLarge-requests-v2-CVE-.patch
      1040-glx-Pass-remaining-request-length-into-varsize-v2-CV.patch
  - Security fixes with no assigned CVE:
      1008-Don-t-crash-when-we-receive-an-FS_Error-from-the-fon.patch

1 files changed, 413 insertions, 0 deletions

diff --git a/debian/patches/1038-glx-Length-checking-for-non-generated-single-request.patch b/debian/patches/1038-glx-Length-checking-for-non-generated-single-request.patch
new file mode 100644
index 000000000..5db4682df
--- /dev/null
+++ b/debian/patches/1038-glx-Length-checking-for-non-generated-single-request.patch
@@ -0,0 +1,413 @@
+From 8931066077a04999d973932e04da577bd6906c82 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 10 Nov 2014 12:13:47 -0500
+Subject: [PATCH 38/40] glx: Length checking for non-generated single requests
+ (v2) [CVE-2014-8098 7/8]
+
+v2:
+Fix single versus vendor-private length checking for ARB_imaging subset
+extensions. (Julien Cristau)
+
+v3:
+Fix single versus vendor-private length checking for ARB_imaging subset
+extensions. (Julien Cristau)
+
+v4: backport to nx-libs 3.6.x (Mike DePaulo)
+
+Reviewed-by: Michal Srb <msrb@suse.com>
+Reviewed-by: Andy Ritger <aritger@nvidia.com>
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Signed-off-by: Fedora X Ninjas <x@fedoraproject.org>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+fix safe_Add
+---
+ nx-X11/programs/Xserver/GL/glx/single2.c       | 21 +++++++++++++++------
+ nx-X11/programs/Xserver/GL/glx/single2swap.c   | 15 +++++++++++----
+ nx-X11/programs/Xserver/GL/glx/singlepix.c     | 19 ++++++++++++++-----
+ nx-X11/programs/Xserver/GL/glx/singlepixswap.c | 17 ++++++++++++-----
+ 4 files changed, 52 insertions(+), 20 deletions(-)
+
+diff --git a/nx-X11/programs/Xserver/GL/glx/single2.c b/nx-X11/programs/Xserver/GL/glx/single2.c
+index 9fee5ff..10152c3 100644
+--- a/nx-X11/programs/Xserver/GL/glx/single2.c
++++ b/nx-X11/programs/Xserver/GL/glx/single2.c
+@@ -48,11 +48,14 @@
+ 
+ int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
+ {
++    ClientPtr client = cl->client;
+     GLsizei size;
+     GLenum type;
+     __GLXcontext *cx;
+     int error;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
++
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -78,10 +81,12 @@ int __glXDisp_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
+ 
+ int __glXDisp_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
+ {
++    ClientPtr client = cl->client;
+     __GLXcontext *cx;
+     GLsizei size;
+     int error;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -106,7 +111,7 @@ int __glXDisp_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
+ 
+ int __glXDisp_RenderMode(__GLXclientState *cl, GLbyte *pc)
+ {
+-    ClientPtr client;
++    ClientPtr client = cl->client;
+     xGLXRenderModeReply reply;
+     __GLXcontext *cx;
+     GLint nitems=0, retBytes=0, retval, newModeCheck;
+@@ -114,6 +119,8 @@ int __glXDisp_RenderMode(__GLXclientState *cl, GLbyte *pc)
+     GLenum newMode;
+     int error;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
++
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -188,7 +195,6 @@ int __glXDisp_RenderMode(__GLXclientState *cl, GLbyte *pc)
+     ** selection array, as per the API for glRenderMode itself.
+     */
+   noChangeAllowed:;
+-    client = cl->client;
+     reply.length = nitems;
+     reply.type = X_Reply;
+     reply.sequenceNumber = client->sequence;
+@@ -204,9 +210,11 @@ int __glXDisp_RenderMode(__GLXclientState *cl, GLbyte *pc)
+ 
+ int __glXDisp_Flush(__GLXclientState *cl, GLbyte *pc)
+ {
++        ClientPtr client = cl->client;
+ 	__GLXcontext *cx;
+ 	int error;
+ 
++	REQUEST_SIZE_MATCH(xGLXSingleReq);
+ 	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+ 	if (!cx) {
+ 		return error;
+@@ -219,10 +227,11 @@ int __glXDisp_Flush(__GLXclientState *cl, GLbyte *pc)
+ 
+ int __glXDisp_Finish(__GLXclientState *cl, GLbyte *pc)
+ {
++    ClientPtr client = cl->client;
+     __GLXcontext *cx;
+-    ClientPtr client;
+     int error;
+ 
++    REQUEST_SIZE_MATCH(xGLXSingleReq);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -233,7 +242,6 @@ int __glXDisp_Finish(__GLXclientState *cl, GLbyte *pc)
+     __GLX_NOTE_FLUSHED_CMDS(cx);
+ 
+     /* Send empty reply packet to indicate finish is finished */
+-    client = cl->client;
+     __GLX_BEGIN_REPLY(0);
+     __GLX_SEND_HEADER();
+     return Success;
+@@ -302,7 +310,7 @@ char *__glXcombine_strings(const char *cext_string, const char *sext_string)
+ 
+ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
+ {
+-    ClientPtr client;
++    ClientPtr client = cl->client;
+     __GLXcontext *cx;
+     GLenum name;
+     const char *string;
+@@ -311,6 +319,8 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
+     char *buf = NULL, *buf1 = NULL;
+     GLint length = 0;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
++
+     /* If the client has the opposite byte order, swap the contextTag and
+      * the name.
+      */
+@@ -327,7 +337,6 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
+     pc += __GLX_SINGLE_HDR_SIZE;
+     name = *(GLenum *)(pc + 0);
+     string = (const char *)glGetString(name);
+-    client = cl->client;
+ 
+     /*
+     ** Restrict extensions to those that are supported by both the
+diff --git a/nx-X11/programs/Xserver/GL/glx/single2swap.c b/nx-X11/programs/Xserver/GL/glx/single2swap.c
+index dab98ad..4b8541b 100644
+--- a/nx-X11/programs/Xserver/GL/glx/single2swap.c
++++ b/nx-X11/programs/Xserver/GL/glx/single2swap.c
+@@ -48,12 +48,14 @@
+ 
+ int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
+ {
++    ClientPtr client = cl->client;
+     GLsizei size;
+     GLenum type;
+     __GLX_DECLARE_SWAP_VARIABLES;
+     __GLXcontext *cx;
+     int error;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 8);
+     __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+@@ -82,11 +84,13 @@ int __glXDispSwap_FeedbackBuffer(__GLXclientState *cl, GLbyte *pc)
+ 
+ int __glXDispSwap_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
+ {
++    ClientPtr client = cl->client;
+     __GLXcontext *cx;
+     GLsizei size;
+     __GLX_DECLARE_SWAP_VARIABLES;
+     int error;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
+     __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+@@ -113,7 +117,7 @@ int __glXDispSwap_SelectBuffer(__GLXclientState *cl, GLbyte *pc)
+ 
+ int __glXDispSwap_RenderMode(__GLXclientState *cl, GLbyte *pc)
+ {
+-    ClientPtr client;
++    ClientPtr client = cl->client;
+     __GLXcontext *cx;
+     xGLXRenderModeReply reply;
+     GLint nitems=0, retBytes=0, retval, newModeCheck;
+@@ -123,6 +127,8 @@ int __glXDispSwap_RenderMode(__GLXclientState *cl, GLbyte *pc)
+     __GLX_DECLARE_SWAP_ARRAY_VARIABLES;
+     int error;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
++
+     __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+@@ -201,7 +207,6 @@ int __glXDispSwap_RenderMode(__GLXclientState *cl, GLbyte *pc)
+     ** selection array, as per the API for glRenderMode itself.
+     */
+   noChangeAllowed:;
+-    client = cl->client;
+     reply.length = nitems;
+     reply.type = X_Reply;
+     reply.sequenceNumber = client->sequence;
+@@ -222,10 +227,12 @@ int __glXDispSwap_RenderMode(__GLXclientState *cl, GLbyte *pc)
+ 
+ int __glXDispSwap_Flush(__GLXclientState *cl, GLbyte *pc)
+ {
++    ClientPtr client = cl->client;
+ 	__GLXcontext *cx;
+ 	int error;
+ 	__GLX_DECLARE_SWAP_VARIABLES;
+ 
++	REQUEST_SIZE_MATCH(xGLXSingleReq);
+ 	__GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+ 	cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+ 	if (!cx) {
+@@ -239,11 +246,12 @@ int __glXDispSwap_Flush(__GLXclientState *cl, GLbyte *pc)
+ 
+ int __glXDispSwap_Finish(__GLXclientState *cl, GLbyte *pc)
+ {
++    ClientPtr client = cl->client;
+     __GLXcontext *cx;
+-    ClientPtr client;
+     int error;
+     __GLX_DECLARE_SWAP_VARIABLES;
+ 
++    REQUEST_SIZE_MATCH(xGLXSingleReq);
+     __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+@@ -255,7 +263,6 @@ int __glXDispSwap_Finish(__GLXclientState *cl, GLbyte *pc)
+     __GLX_NOTE_FLUSHED_CMDS(cx);
+ 
+     /* Send empty reply packet to indicate finish is finished */
+-    client = cl->client;
+     __GLX_BEGIN_REPLY(0);
+     __GLX_PUT_RETVAL(0);
+     __GLX_SWAP_REPLY_HEADER();
+diff --git a/nx-X11/programs/Xserver/GL/glx/singlepix.c b/nx-X11/programs/Xserver/GL/glx/singlepix.c
+index be804d8..a156db5 100644
+--- a/nx-X11/programs/Xserver/GL/glx/singlepix.c
++++ b/nx-X11/programs/Xserver/GL/glx/singlepix.c
+@@ -57,6 +57,8 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
+     int error;
+     char *answer, answerBuffer[200];
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 28);
++
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -108,6 +110,7 @@ int __glXDisp_GetTexImage(__GLXclientState *cl, GLbyte *pc)
+     char *answer, answerBuffer[200];
+     GLint width=0, height=0, depth=1;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 20);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -204,6 +207,7 @@ int __glXDisp_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+     char *answer, answerBuffer[200];
+     GLint width=0, height=0;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -227,13 +231,11 @@ int __glXDisp_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+     compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
+     compsize2 = __glGetTexImage_size(target,1,format,type,height,1,1);
+ 
+-    if (compsize < 0) return BadLength;
+-    if (compsize2 < 0) compsize2 = 0;
+-    compsize = __GLX_PAD(compsize);
+-    compsize2 = __GLX_PAD(compsize2);
++    if ((compsize = safe_pad(compsize)) < 0) return BadLength;
++    if ((compsize2 = safe_pad(compsize2)) < 0) return BadLength;
+ 
+     glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
+-    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize + compsize2,1);
++    __GLX_GET_ANSWER_BUFFER(answer,cl,safe_add(compsize, compsize2),1);
+     __glXClearErrorOccured();
+     glGetSeparableFilter(
+ 		  *(GLenum   *)(pc + 0),
+@@ -269,6 +271,7 @@ int __glXDisp_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
+     char *answer, answerBuffer[200];
+     GLint width=0, height=0;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -328,6 +331,8 @@ int __glXDisp_GetHistogram(__GLXclientState *cl, GLbyte *pc)
+     char *answer, answerBuffer[200];
+     GLint width=0;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
++
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -376,6 +381,8 @@ int __glXDisp_GetMinmax(__GLXclientState *cl, GLbyte *pc)
+     int error;
+     char *answer, answerBuffer[200];
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
++
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -419,6 +426,8 @@ int __glXDisp_GetColorTable(__GLXclientState *cl, GLbyte *pc)
+     char *answer, answerBuffer[200];
+     GLint width=0;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
++
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+diff --git a/nx-X11/programs/Xserver/GL/glx/singlepixswap.c b/nx-X11/programs/Xserver/GL/glx/singlepixswap.c
+index cdc6f16..24f2e76 100644
+--- a/nx-X11/programs/Xserver/GL/glx/singlepixswap.c
++++ b/nx-X11/programs/Xserver/GL/glx/singlepixswap.c
+@@ -58,6 +58,8 @@ int __glXDispSwap_ReadPixels(__GLXclientState *cl, GLbyte *pc)
+     int error;
+     char *answer, answerBuffer[200];
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 28);
++
+     __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+@@ -120,6 +122,7 @@ int __glXDispSwap_GetTexImage(__GLXclientState *cl, GLbyte *pc)
+     char *answer, answerBuffer[200];
+     GLint width=0, height=0, depth=1;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 24);
+     __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+@@ -190,6 +193,7 @@ int __glXDispSwap_GetPolygonStipple(__GLXclientState *cl, GLbyte *pc)
+     char *answer;
+     __GLX_DECLARE_SWAP_VARIABLES;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 4);
+     __GLX_SWAP_INT(&((xGLXSingleReq *)pc)->contextTag);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+@@ -230,6 +234,7 @@ int __glXDispSwap_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+     char *answer, answerBuffer[200];
+     GLint width=0, height=0;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -257,13 +262,11 @@ int __glXDispSwap_GetSeparableFilter(__GLXclientState *cl, GLbyte *pc)
+     compsize = __glGetTexImage_size(target,1,format,type,width,1,1);
+     compsize2 = __glGetTexImage_size(target,1,format,type,height,1,1);
+ 
+-    if (compsize < 0) return BadLength;
+-    if (compsize2 < 0) compsize2 = 0;
+-    compsize = __GLX_PAD(compsize);
+-    compsize2 = __GLX_PAD(compsize2);
++    if ((compsize = safe_pad(compsize)) < 0) return BadLength;
++    if ((compsize2 = safe_pad(compsize2)) < 0) return BadLength;
+ 
+     glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
+-    __GLX_GET_ANSWER_BUFFER(answer,cl,compsize + compsize2,1);
++    __GLX_GET_ANSWER_BUFFER(answer,cl,safe_add(compsize, compsize2),1);
+     __glXClearErrorOccured();
+     glGetSeparableFilter(
+ 		  *(GLenum   *)(pc + 0),
+@@ -302,6 +305,7 @@ int __glXDispSwap_GetConvolutionFilter(__GLXclientState *cl, GLbyte *pc)
+     char *answer, answerBuffer[200];
+     GLint width=0, height=0;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -368,6 +372,7 @@ int __glXDispSwap_GetHistogram(__GLXclientState *cl, GLbyte *pc)
+     char *answer, answerBuffer[200];
+     GLint width=0;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -422,6 +427,7 @@ int __glXDispSwap_GetMinmax(__GLXclientState *cl, GLbyte *pc)
+     __GLX_DECLARE_SWAP_VARIABLES;
+     char *answer, answerBuffer[200];
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+@@ -470,6 +476,7 @@ int __glXDispSwap_GetColorTable(__GLXclientState *cl, GLbyte *pc)
+     char *answer, answerBuffer[200];
+     GLint width=0;
+ 
++    REQUEST_FIXED_SIZE(xGLXSingleReq, 16);
+     cx = __glXForceCurrent(cl, __GLX_GET_SINGLE_CONTEXT_TAG(pc), &error);
+     if (!cx) {
+ 	return error;
+-- 
+2.1.4
+