ODROID-U3 xorg-server debian package fork :

[deb_xorg-server.git] / debian / patches / CVE-2014-8xxx / 0021-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch

diff --git a/debian/patches/CVE-2014-8xxx/0021-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch b/debian/patches/CVE-2014-8xxx/0021-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch
index 591e88e83c9c6bf28afbef841b6655f7f3cdf319..e3d2b39eaa55ee6ab998e27bf22bf0927c182e4e 100644 (file)
--- a/debian/patches/CVE-2014-8xxx/0021-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch
+++ b/debian/patches/CVE-2014-8xxx/0021-glx-Be-more-strict-about-rejecting-invalid-image-siz.patch
@@ -20,11 +20,9 @@ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  glx/singlepixswap.c |   16 ++++++++--------
  2 files changed, 16 insertions(+), 16 deletions(-)
 
-diff --git a/glx/singlepix.c b/glx/singlepix.c
-index 506fdaa..8b6c261 100644
 --- a/glx/singlepix.c
 +++ b/glx/singlepix.c
-@@ -65,7 +65,7 @@ __glXDisp_ReadPixels(__GLXclientState * cl, GLbyte * pc)
+@@ -65,7 +65,7 @@ __glXDisp_ReadPixels(__GLXclientState *
      lsbFirst = *(GLboolean *) (pc + 25);
      compsize = __glReadPixels_size(format, type, width, height);
      if (compsize < 0)
@@ -33,7 +31,7 @@ index 506fdaa..8b6c261 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
-@@ -124,7 +124,7 @@ __glXDisp_GetTexImage(__GLXclientState * cl, GLbyte * pc)
+@@ -124,7 +124,7 @@ __glXDisp_GetTexImage(__GLXclientState *
      compsize =
          __glGetTexImage_size(target, level, format, type, width, height, depth);
      if (compsize < 0)
@@ -42,7 +40,7 @@ index 506fdaa..8b6c261 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
-@@ -218,9 +218,9 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
+@@ -218,9 +218,9 @@ GetSeparableFilter(__GLXclientState * cl
      compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1);
  
      if (compsize < 0)
@@ -54,7 +52,7 @@ index 506fdaa..8b6c261 100644
      compsize = __GLX_PAD(compsize);
      compsize2 = __GLX_PAD(compsize2);
  
-@@ -296,7 +296,7 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
+@@ -296,7 +296,7 @@ GetConvolutionFilter(__GLXclientState *
       */
      compsize = __glGetTexImage_size(target, 1, format, type, width, height, 1);
      if (compsize < 0)
@@ -63,7 +61,7 @@ index 506fdaa..8b6c261 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
-@@ -365,7 +365,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
+@@ -365,7 +365,7 @@ GetHistogram(__GLXclientState * cl, GLby
       */
      compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
      if (compsize < 0)
@@ -72,7 +70,7 @@ index 506fdaa..8b6c261 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
-@@ -426,7 +426,7 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
+@@ -426,7 +426,7 @@ GetMinmax(__GLXclientState * cl, GLbyte
  
      compsize = __glGetTexImage_size(target, 1, format, type, 2, 1, 1);
      if (compsize < 0)
@@ -81,7 +79,7 @@ index 506fdaa..8b6c261 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
-@@ -491,7 +491,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
+@@ -491,7 +491,7 @@ GetColorTable(__GLXclientState * cl, GLb
       */
      compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
      if (compsize < 0)
@@ -90,11 +88,9 @@ index 506fdaa..8b6c261 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
-diff --git a/glx/singlepixswap.c b/glx/singlepixswap.c
-index 8469101..8dc304f 100644
 --- a/glx/singlepixswap.c
 +++ b/glx/singlepixswap.c
-@@ -75,7 +75,7 @@ __glXDispSwap_ReadPixels(__GLXclientState * cl, GLbyte * pc)
+@@ -75,7 +75,7 @@ __glXDispSwap_ReadPixels(__GLXclientStat
      lsbFirst = *(GLboolean *) (pc + 25);
      compsize = __glReadPixels_size(format, type, width, height);
      if (compsize < 0)
@@ -103,7 +99,7 @@ index 8469101..8dc304f 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
-@@ -144,7 +144,7 @@ __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc)
+@@ -144,7 +144,7 @@ __glXDispSwap_GetTexImage(__GLXclientSta
      compsize =
          __glGetTexImage_size(target, level, format, type, width, height, depth);
      if (compsize < 0)
@@ -112,7 +108,7 @@ index 8469101..8dc304f 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
-@@ -252,9 +252,9 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
+@@ -252,9 +252,9 @@ GetSeparableFilter(__GLXclientState * cl
      compsize2 = __glGetTexImage_size(target, 1, format, type, height, 1, 1);
  
      if (compsize < 0)
@@ -124,7 +120,7 @@ index 8469101..8dc304f 100644
      compsize = __GLX_PAD(compsize);
      compsize2 = __GLX_PAD(compsize2);
  
-@@ -338,7 +338,7 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
+@@ -338,7 +338,7 @@ GetConvolutionFilter(__GLXclientState *
       */
      compsize = __glGetTexImage_size(target, 1, format, type, width, height, 1);
      if (compsize < 0)
@@ -133,7 +129,7 @@ index 8469101..8dc304f 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
-@@ -415,7 +415,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
+@@ -415,7 +415,7 @@ GetHistogram(__GLXclientState * cl, GLby
       */
      compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
      if (compsize < 0)
@@ -142,7 +138,7 @@ index 8469101..8dc304f 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
-@@ -483,7 +483,7 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
+@@ -483,7 +483,7 @@ GetMinmax(__GLXclientState * cl, GLbyte
  
      compsize = __glGetTexImage_size(target, 1, format, type, 2, 1, 1);
      if (compsize < 0)
@@ -151,7 +147,7 @@ index 8469101..8dc304f 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
-@@ -554,7 +554,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
+@@ -554,7 +554,7 @@ GetColorTable(__GLXclientState * cl, GLb
       */
      compsize = __glGetTexImage_size(target, 1, format, type, width, 1, 1);
      if (compsize < 0)
@@ -160,6 +156,3 @@ index 8469101..8dc304f 100644
  
      glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
      __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
--- 
-1.7.9.2
-