diff options
Diffstat (limited to 'debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch')
-rw-r--r-- | debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch | 156 |
1 files changed, 0 insertions, 156 deletions
diff --git a/debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch b/debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch deleted file mode 100644 index 6681c7460..000000000 --- a/debian/patches/1032-glx-Be-more-strict-about-rejecting-invalid-imag.full.patch +++ /dev/null @@ -1,156 +0,0 @@ -From cdf0c3e65670c797a4fd0617d44d2bdff4011815 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Mon, 10 Nov 2014 12:13:37 -0500 -Subject: [PATCH 32/40] glx: Be more strict about rejecting invalid image sizes - [CVE-2014-8093 2/6] - -Before this we'd just clamp the image size to 0, which was just -hideously stupid; if the parameters were such that they'd overflow an -integer, you'd allocate a small buffer, then pass huge values into (say) -ReadPixels, and now you're scribbling over arbitrary server memory. - -v2: backport to nx-libs 3.6.x (Mike DePaulo) - -Reviewed-by: Keith Packard <keithp@keithp.com> -Reviewed-by: Julien Cristau <jcristau@debian.org> -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: Alan Coopersmith <alan.coopersmith@oracle.com> -Signed-off-by: Fedora X Ninjas <x@fedoraproject.org> -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- - nx-X11/programs/Xserver/GL/glx/singlepix.c | 14 +++++++------- - nx-X11/programs/Xserver/GL/glx/singlepixswap.c | 14 +++++++------- - 2 files changed, 14 insertions(+), 14 deletions(-) - ---- a/nx-X11/programs/Xserver/GL/glx/singlepix.c -+++ b/nx-X11/programs/Xserver/GL/glx/singlepix.c -@@ -70,7 +70,7 @@ int __glXDisp_ReadPixels(__GLXclientStat - swapBytes = *(GLboolean *)(pc + 24); - lsbFirst = *(GLboolean *)(pc + 25); - compsize = __glReadPixels_size(format,type,width,height); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); - glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst); -@@ -130,7 +130,7 @@ int __glXDisp_GetTexImage(__GLXclientSta - * are illegal, but then width, height, and depth would still be zero anyway. - */ - compsize = __glGetTexImage_size(target,level,format,type,width,height,depth); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); - __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1); -@@ -227,7 +227,7 @@ int __glXDisp_GetSeparableFilter(__GLXcl - compsize = __glGetTexImage_size(target,1,format,type,width,1,1); - compsize2 = __glGetTexImage_size(target,1,format,type,height,1,1); - -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - if (compsize2 < 0) compsize2 = 0; - compsize = __GLX_PAD(compsize); - compsize2 = __GLX_PAD(compsize2); -@@ -291,7 +291,7 @@ int __glXDisp_GetConvolutionFilter(__GLX - * are illegal, but then width and height would still be zero anyway. - */ - compsize = __glGetTexImage_size(target,1,format,type,width,height,1); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); - __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1); -@@ -346,7 +346,7 @@ int __glXDisp_GetHistogram(__GLXclientSt - * are illegal, but then width would still be zero anyway. - */ - compsize = __glGetTexImage_size(target,1,format,type,width,1,1); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); - __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1); -@@ -389,7 +389,7 @@ int __glXDisp_GetMinmax(__GLXclientState - reset = *(GLboolean *)(pc + 13); - - compsize = __glGetTexImage_size(target,1,format,type,2,1,1); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); - __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1); -@@ -436,7 +436,7 @@ int __glXDisp_GetColorTable(__GLXclientS - * are illegal, but then width would still be zero anyway. - */ - compsize = __glGetTexImage_size(target,1,format,type,width,1,1); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes); - __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1); ---- a/nx-X11/programs/Xserver/GL/glx/singlepixswap.c -+++ b/nx-X11/programs/Xserver/GL/glx/singlepixswap.c -@@ -79,7 +79,7 @@ int __glXDispSwap_ReadPixels(__GLXclient - swapBytes = *(GLboolean *)(pc + 24); - lsbFirst = *(GLboolean *)(pc + 25); - compsize = __glReadPixels_size(format,type,width,height); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); - glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst); -@@ -148,7 +148,7 @@ int __glXDispSwap_GetTexImage(__GLXclien - * are illegal, but then width, height, and depth would still be zero anyway. - */ - compsize = __glGetTexImage_size(target,level,format,type,width,height,depth); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); - __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1); -@@ -257,7 +257,7 @@ int __glXDispSwap_GetSeparableFilter(__G - compsize = __glGetTexImage_size(target,1,format,type,width,1,1); - compsize2 = __glGetTexImage_size(target,1,format,type,height,1,1); - -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - if (compsize2 < 0) compsize2 = 0; - compsize = __GLX_PAD(compsize); - compsize2 = __GLX_PAD(compsize2); -@@ -328,7 +328,7 @@ int __glXDispSwap_GetConvolutionFilter(_ - * are illegal, but then width and height would still be zero anyway. - */ - compsize = __glGetTexImage_size(target,1,format,type,width,height,1); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); - __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1); -@@ -390,7 +390,7 @@ int __glXDispSwap_GetHistogram(__GLXclie - * are illegal, but then width would still be zero anyway. - */ - compsize = __glGetTexImage_size(target,1,format,type,width,1,1); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); - __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1); -@@ -439,7 +439,7 @@ int __glXDispSwap_GetMinmax(__GLXclientS - reset = *(GLboolean *)(pc + 13); - - compsize = __glGetTexImage_size(target,1,format,type,2,1,1); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); - __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1); -@@ -491,7 +491,7 @@ int __glXDispSwap_GetColorTable(__GLXcli - * are illegal, but then width would still be zero anyway. - */ - compsize = __glGetTexImage_size(target,1,format,type,width,1,1); -- if (compsize < 0) compsize = 0; -+ if (compsize < 0) return BadLength; - - glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes); - __GLX_GET_ANSWER_BUFFER(answer,cl,compsize,1); |