X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2FCVE-2014-8xxx%2F0026-glx-Integer-overflow-protection-for-non-generated-re.patch;h=cd45c9e847cce37aeab49ddfd4d1aa1a726bd054;hp=4a13b3ef8443fd57af962d55f97f4a80aa418f6c;hb=4db25562fe97995f20b8adc0f2e6959ed82e8635;hpb=7217e0ca50bba73dad94782e67980aeeb24ab693

diff --git a/debian/patches/CVE-2014-8xxx/0026-glx-Integer-overflow-protection-for-non-generated-re.patch b/debian/patches/CVE-2014-8xxx/0026-glx-Integer-overflow-protection-for-non-generated-re.patch
index 4a13b3e..cd45c9e 100644
--- a/debian/patches/CVE-2014-8xxx/0026-glx-Integer-overflow-protection-for-non-generated-re.patch
+++ b/debian/patches/CVE-2014-8xxx/0026-glx-Integer-overflow-protection-for-non-generated-re.patch
@@ -20,8 +20,6 @@ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  glx/rensize.c |   77 ++++++++++++++++++++++++++++++---------------------------
  1 file changed, 41 insertions(+), 36 deletions(-)
 
-diff --git a/glx/rensize.c b/glx/rensize.c
-index 9ff73c7..d46334a 100644
 --- a/glx/rensize.c
 +++ b/glx/rensize.c
 @@ -43,19 +43,11 @@
@@ -45,7 +43,7 @@ index 9ff73c7..d46334a 100644
  
      target = *(GLenum *) (pc + 16);
      order = *(GLint *) (pc + 20);
-@@ -63,15 +55,16 @@ __glXMap1dReqSize(const GLbyte * pc, Bool swap)
+@@ -63,15 +55,16 @@ __glXMap1dReqSize(const GLbyte * pc, Boo
          target = SWAPL(target);
          order = SWAPL(order);
      }
@@ -65,7 +63,7 @@ index 9ff73c7..d46334a 100644
  
      target = *(GLenum *) (pc + 0);
      order = *(GLint *) (pc + 12);
-@@ -79,23 +72,24 @@ __glXMap1fReqSize(const GLbyte * pc, Bool swap)
+@@ -79,23 +72,24 @@ __glXMap1fReqSize(const GLbyte * pc, Boo
          target = SWAPL(target);
          order = SWAPL(order);
      }
@@ -95,7 +93,7 @@ index 9ff73c7..d46334a 100644
  
      target = *(GLenum *) (pc + 32);
      uorder = *(GLint *) (pc + 36);
-@@ -105,15 +99,14 @@ __glXMap2dReqSize(const GLbyte * pc, Bool swap)
+@@ -105,15 +99,14 @@ __glXMap2dReqSize(const GLbyte * pc, Boo
          uorder = SWAPL(uorder);
          vorder = SWAPL(vorder);
      }
@@ -113,7 +111,7 @@ index 9ff73c7..d46334a 100644
  
      target = *(GLenum *) (pc + 0);
      uorder = *(GLint *) (pc + 12);
-@@ -123,8 +116,7 @@ __glXMap2fReqSize(const GLbyte * pc, Bool swap)
+@@ -123,8 +116,7 @@ __glXMap2fReqSize(const GLbyte * pc, Boo
          uorder = SWAPL(uorder);
          vorder = SWAPL(vorder);
      }
@@ -123,7 +121,7 @@ index 9ff73c7..d46334a 100644
  }
  
  /**
-@@ -175,14 +167,16 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
+@@ -175,14 +167,16 @@ __glXImageSize(GLenum format, GLenum typ
      GLint bytesPerElement, elementsPerGroup, groupsPerRow;
      GLint groupSize, rowSize, padding, imageSize;
  
@@ -142,7 +140,7 @@ index 9ff73c7..d46334a 100644
      switch (target) {
      case GL_PROXY_TEXTURE_1D:
      case GL_PROXY_TEXTURE_2D:
-@@ -199,6 +193,12 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
+@@ -199,6 +193,12 @@ __glXImageSize(GLenum format, GLenum typ
          return 0;
      }
  
@@ -155,7 +153,7 @@ index 9ff73c7..d46334a 100644
      if (type == GL_BITMAP) {
          if (rowLength > 0) {
              groupsPerRow = rowLength;
-@@ -207,11 +207,14 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
+@@ -207,11 +207,14 @@ __glXImageSize(GLenum format, GLenum typ
              groupsPerRow = w;
          }
          rowSize = bits_to_bytes(groupsPerRow);
@@ -171,7 +169,7 @@ index 9ff73c7..d46334a 100644
      }
      else {
          switch (format) {
-@@ -303,6 +306,7 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
+@@ -303,6 +306,7 @@ __glXImageSize(GLenum format, GLenum typ
          default:
              return -1;
          }
@@ -179,7 +177,7 @@ index 9ff73c7..d46334a 100644
          groupSize = bytesPerElement * elementsPerGroup;
          if (rowLength > 0) {
              groupsPerRow = rowLength;
-@@ -310,18 +314,21 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
+@@ -310,18 +314,21 @@ __glXImageSize(GLenum format, GLenum typ
          else {
              groupsPerRow = w;
          }
@@ -209,7 +207,7 @@ index 9ff73c7..d46334a 100644
      }
  }
  
-@@ -445,9 +452,7 @@ __glXSeparableFilter2DReqSize(const GLbyte * pc, Bool swap)
+@@ -445,9 +452,7 @@ __glXSeparableFilter2DReqSize(const GLby
      /* XXX Should rowLength be used for either or both image? */
      image1size = __glXImageSize(format, type, 0, w, 1, 1,
                                  0, rowLength, 0, 0, alignment);
@@ -220,6 +218,3 @@ index 9ff73c7..d46334a 100644
 -
 +    return safe_add(safe_pad(image1size), image2size);
  }
--- 
-1.7.9.2
-