summaryrefslogtreecommitdiff
path: root/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2
diff options
context:
space:
mode:
Diffstat (limited to 'x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2')
-rw-r--r--x11-servers/xorg-server/files/patch-CVE-2014-8100-1-230
1 files changed, 30 insertions, 0 deletions
diff --git a/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2 b/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2
new file mode 100644
index 000000000000..a2ae0541e95e
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-CVE-2014-8100-1-2
@@ -0,0 +1,30 @@
+From b5f9ef03df6a650571b29d3d1c1d2b67c6e84336 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Tue, 28 Oct 2014 10:30:04 +0100
+Subject: [PATCH 13/40] render: check request size before reading it
+ [CVE-2014-8100 1/2]
+
+Otherwise we may be reading outside of the client request.
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+ render/render.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- render/render.c.orig 2014-12-10 16:06:01.737046585 +0100
++++ render/render.c 2014-12-10 16:07:49.285040265 +0100
+@@ -271,10 +271,11 @@
+
+ REQUEST(xRenderQueryVersionReq);
+
++ REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
++
+ pRenderClient->major_version = stuff->majorVersion;
+ pRenderClient->minor_version = stuff->minorVersion;
+
+- REQUEST_SIZE_MATCH(xRenderQueryVersionReq);
+ memset(&rep, 0, sizeof(xRenderQueryVersionReply));
+ rep.type = X_Reply;
+ rep.length = 0;