Merge branch '3.6.x'

1 files changed, 0 insertions, 48 deletions

diff --git a/debian/patches/1037-glx-Top-level-length-checking-for-swapped-Vendo.full.patch b/debian/patches/1037-glx-Top-level-length-checking-for-swapped-Vendo.full.patch
deleted file mode 100644
index 702c4bd87..000000000
--- a/debian/patches/1037-glx-Top-level-length-checking-for-swapped-Vendo.full.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ad29acd7697e18333e164b1746f61c5a9e29a436 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 10 Nov 2014 12:13:44 -0500
-Subject: [PATCH 37/40] glx: Top-level length checking for swapped
- VendorPrivate requests [CVE-2014-8098 4/8]
-
-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/glxcmdsswap.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c
-+++ b/nx-X11/programs/Xserver/GL/glx/glxcmdsswap.c
-@@ -797,10 +797,12 @@ int __glXSwapRenderLarge(__GLXclientStat
- 
- int __glXSwapVendorPrivate(__GLXclientState *cl, GLbyte *pc)
- {
-+    ClientPtr client = cl->client;
-     xGLXVendorPrivateReq *req;
-     GLint vendorcode;
- 
-     __GLX_DECLARE_SWAP_VARIABLES;
-+    REQUEST_AT_LEAST_SIZE(xGLXVendorPrivateReq);
- 
-     req = (xGLXVendorPrivateReq *) pc;
-     __GLX_SWAP_SHORT(&req->length);
-@@ -835,10 +837,12 @@ int __glXSwapVendorPrivate(__GLXclientSt
- 
- int __glXSwapVendorPrivateWithReply(__GLXclientState *cl, GLbyte *pc)
- {
-+    ClientPtr client = cl->client;
-     xGLXVendorPrivateWithReplyReq *req;
-     GLint vendorcode;
- 
-     __GLX_DECLARE_SWAP_VARIABLES;
-+    REQUEST_AT_LEAST_SIZE(xGLXVendorPrivateWithReplyReq);
- 
-     req = (xGLXVendorPrivateWithReplyReq *) pc;
-     __GLX_SWAP_SHORT(&req->length);