ODROID-U3 xorg-server debian package fork :

[deb_xorg-server.git] / debian / patches / CVE-2014-8xxx / 0000-glx-check-return.patch

diff --git a/debian/patches/CVE-2014-8xxx/0000-glx-check-return.patch b/debian/patches/CVE-2014-8xxx/0000-glx-check-return.patch
index a65217414b4f0cfcef8b12368c192d63fe79714c..5da88721d605359eb48767129c646c50a13338de 100644 (file)
--- a/debian/patches/CVE-2014-8xxx/0000-glx-check-return.patch
+++ b/debian/patches/CVE-2014-8xxx/0000-glx-check-return.patch
@@ -8,11 +8,9 @@ This function can return NULL; make sure every caller tests for that.
 Reviewed-by: Adam Jackson <ajax@redhat.com>
 Signed-off-by: Keith Packard <keithp@keithp.com>
 
-diff --git a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c
-index 329b2e6..f6cabef 100644
 --- a/glx/indirect_dispatch.c
 +++ b/glx/indirect_dispatch.c
-@@ -2464,6 +2464,9 @@ __glXDisp_AreTexturesResident(__GLXclientState * cl, GLbyte * pc)
+@@ -2464,6 +2464,9 @@ __glXDisp_AreTexturesResident(__GLXclien
          GLboolean answerBuffer[200];
          GLboolean *residences =
              __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
@@ -22,7 +20,7 @@ index 329b2e6..f6cabef 100644
          retval =
              glAreTexturesResident(n, (const GLuint *) (pc + 4), residences);
          __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
-@@ -2488,6 +2491,9 @@ __glXDisp_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc)
+@@ -2488,6 +2491,9 @@ __glXDisp_AreTexturesResidentEXT(__GLXcl
          GLboolean answerBuffer[200];
          GLboolean *residences =
              __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
@@ -32,7 +30,7 @@ index 329b2e6..f6cabef 100644
          retval =
              glAreTexturesResident(n, (const GLuint *) (pc + 4), residences);
          __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
-@@ -2593,6 +2599,9 @@ __glXDisp_GenTextures(__GLXclientState * cl, GLbyte * pc)
+@@ -2593,6 +2599,9 @@ __glXDisp_GenTextures(__GLXclientState *
          GLuint *textures =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -42,7 +40,7 @@ index 329b2e6..f6cabef 100644
          glGenTextures(n, textures);
          __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0);
          error = Success;
-@@ -2616,6 +2625,9 @@ __glXDisp_GenTexturesEXT(__GLXclientState * cl, GLbyte * pc)
+@@ -2616,6 +2625,9 @@ __glXDisp_GenTexturesEXT(__GLXclientStat
          GLuint *textures =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -52,7 +50,7 @@ index 329b2e6..f6cabef 100644
          glGenTextures(n, textures);
          __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0);
          error = Success;
-@@ -3883,6 +3895,9 @@ __glXDisp_GenQueries(__GLXclientState * cl, GLbyte * pc)
+@@ -3883,6 +3895,9 @@ __glXDisp_GenQueries(__GLXclientState *
          GLuint *ids =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -62,7 +60,7 @@ index 329b2e6..f6cabef 100644
          GenQueries(n, ids);
          __glXSendReply(cl->client, ids, n, 4, GL_TRUE, 0);
          error = Success;
-@@ -4253,6 +4268,9 @@ __glXDisp_GenProgramsARB(__GLXclientState * cl, GLbyte * pc)
+@@ -4253,6 +4268,9 @@ __glXDisp_GenProgramsARB(__GLXclientStat
          GLuint *programs =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -72,7 +70,7 @@ index 329b2e6..f6cabef 100644
          GenProgramsARB(n, programs);
          __glXSendReply(cl->client, programs, n, 4, GL_TRUE, 0);
          error = Success;
-@@ -4630,6 +4648,10 @@ __glXDisp_GenFramebuffers(__GLXclientState * cl, GLbyte * pc)
+@@ -4630,6 +4648,10 @@ __glXDisp_GenFramebuffers(__GLXclientSta
          GLuint *framebuffers =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -83,7 +81,7 @@ index 329b2e6..f6cabef 100644
          GenFramebuffers(n, framebuffers);
          __glXSendReply(cl->client, framebuffers, n, 4, GL_TRUE, 0);
          error = Success;
-@@ -4655,6 +4677,9 @@ __glXDisp_GenRenderbuffers(__GLXclientState * cl, GLbyte * pc)
+@@ -4655,6 +4677,9 @@ __glXDisp_GenRenderbuffers(__GLXclientSt
          GLuint *renderbuffers =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -93,11 +91,9 @@ index 329b2e6..f6cabef 100644
          GenRenderbuffers(n, renderbuffers);
          __glXSendReply(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
          error = Success;
-diff --git a/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c
-index 647d0c9..c0bb64d 100644
 --- a/glx/indirect_dispatch_swap.c
 +++ b/glx/indirect_dispatch_swap.c
-@@ -2731,6 +2731,9 @@ __glXDispSwap_AreTexturesResident(__GLXclientState * cl, GLbyte * pc)
+@@ -2731,6 +2731,9 @@ __glXDispSwap_AreTexturesResident(__GLXc
          GLboolean answerBuffer[200];
          GLboolean *residences =
              __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
@@ -107,7 +103,7 @@ index 647d0c9..c0bb64d 100644
          retval =
              glAreTexturesResident(n,
                                    (const GLuint *)
-@@ -2759,6 +2762,9 @@ __glXDispSwap_AreTexturesResidentEXT(__GLXclientState * cl, GLbyte * pc)
+@@ -2759,6 +2762,9 @@ __glXDispSwap_AreTexturesResidentEXT(__G
          GLboolean answerBuffer[200];
          GLboolean *residences =
              __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
@@ -117,7 +113,7 @@ index 647d0c9..c0bb64d 100644
          retval =
              glAreTexturesResident(n,
                                    (const GLuint *)
-@@ -2878,6 +2884,9 @@ __glXDispSwap_GenTextures(__GLXclientState * cl, GLbyte * pc)
+@@ -2878,6 +2884,9 @@ __glXDispSwap_GenTextures(__GLXclientSta
          GLuint *textures =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -127,7 +123,7 @@ index 647d0c9..c0bb64d 100644
          glGenTextures(n, textures);
          (void) bswap_32_array((uint32_t *) textures, n);
          __glXSendReplySwap(cl->client, textures, n, 4, GL_TRUE, 0);
-@@ -2903,6 +2912,9 @@ __glXDispSwap_GenTexturesEXT(__GLXclientState * cl, GLbyte * pc)
+@@ -2903,6 +2912,9 @@ __glXDispSwap_GenTexturesEXT(__GLXclient
          GLuint *textures =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -137,7 +133,7 @@ index 647d0c9..c0bb64d 100644
          glGenTextures(n, textures);
          (void) bswap_32_array((uint32_t *) textures, n);
          __glXSendReplySwap(cl->client, textures, n, 4, GL_TRUE, 0);
-@@ -4290,6 +4302,9 @@ __glXDispSwap_GenQueries(__GLXclientState * cl, GLbyte * pc)
+@@ -4290,6 +4302,9 @@ __glXDispSwap_GenQueries(__GLXclientStat
          GLuint *ids =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -147,7 +143,7 @@ index 647d0c9..c0bb64d 100644
          GenQueries(n, ids);
          (void) bswap_32_array((uint32_t *) ids, n);
          __glXSendReplySwap(cl->client, ids, n, 4, GL_TRUE, 0);
-@@ -4697,6 +4712,9 @@ __glXDispSwap_GenProgramsARB(__GLXclientState * cl, GLbyte * pc)
+@@ -4697,6 +4712,9 @@ __glXDispSwap_GenProgramsARB(__GLXclient
          GLuint *programs =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -157,7 +153,7 @@ index 647d0c9..c0bb64d 100644
          GenProgramsARB(n, programs);
          (void) bswap_32_array((uint32_t *) programs, n);
          __glXSendReplySwap(cl->client, programs, n, 4, GL_TRUE, 0);
-@@ -5122,6 +5140,10 @@ __glXDispSwap_GenFramebuffers(__GLXclientState * cl, GLbyte * pc)
+@@ -5122,6 +5140,10 @@ __glXDispSwap_GenFramebuffers(__GLXclien
          GLuint *framebuffers =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -168,7 +164,7 @@ index 647d0c9..c0bb64d 100644
          GenFramebuffers(n, framebuffers);
          (void) bswap_32_array((uint32_t *) framebuffers, n);
          __glXSendReplySwap(cl->client, framebuffers, n, 4, GL_TRUE, 0);
-@@ -5149,6 +5171,10 @@ __glXDispSwap_GenRenderbuffers(__GLXclientState * cl, GLbyte * pc)
+@@ -5149,6 +5171,10 @@ __glXDispSwap_GenRenderbuffers(__GLXclie
          GLuint *renderbuffers =
              __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer),
                                   4);
@@ -179,6 +175,3 @@ index 647d0c9..c0bb64d 100644
          GenRenderbuffers(n, renderbuffers);
          (void) bswap_32_array((uint32_t *) renderbuffers, n);
          __glXSendReplySwap(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
--- 
-cgit v0.10.2
-