aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-06-02 18:27:15 +0200
committerMihai Moldovan <ionic@ionic.de>2015-06-02 20:22:15 +0200
commite5ff9ace4c2b5a4e04b771c2ec417ceba63218cf (patch)
tree781f39c6d60c442ed159ae13a341c98e95b88fd0 /debian/patches
parent125254d35483d0e645f935b27d3ba8cf52786a36 (diff)
downloadnx-libs-e5ff9ace4c2b5a4e04b771c2ec417ceba63218cf.tar.gz
nx-libs-e5ff9ace4c2b5a4e04b771c2ec417ceba63218cf.tar.bz2
nx-libs-e5ff9ace4c2b5a4e04b771c2ec417ceba63218cf.zip
Security fixes: X.Org CVE-2015-3418:
v3: port to NXdispatch.c rather than dispatch.c (Mike DePaulo) v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan) Changes: - 1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch16
1 files changed, 14 insertions, 2 deletions
diff --git a/debian/patches/1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch b/debian/patches/1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch
index 7b6f28c00..8fc777eda 100644
--- a/debian/patches/1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch
+++ b/debian/patches/1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch
@@ -12,10 +12,11 @@ Date: Fri May 1 13:09:24 2015 +0200
Fix for regression introduced by fix for CVE-2014-8092.
v2: backports to nx-libs 3.6.x (Mike Gabriel)
+ v3: port to NXdispatch.c rather than dispatch.c (Mike DePaulo)
+ v4: backport v3 to nx-libs 3.5.0.x (Mihai Moldovan)
+
Signed-off-by: Keith Packard <keithp@keithp.com>
-diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c
-index 5ad2f5a..ab10640 100644
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -2071,7 +2071,7 @@ ProcPutImage(register ClientPtr client)
@@ -27,3 +28,14 @@ index 5ad2f5a..ab10640 100644
return BadLength;
if (((((lengthProto * stuff->height) + (unsigned)3) >> 2) +
+--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+@@ -2630,7 +2630,7 @@ ProcPutImage(register ClientPtr client)
+
+ tmpImage = (char *)&stuff[1];
+ lengthProto = length;
+- if (lengthProto >= (INT32_MAX / stuff->height))
++ if (stuff->height != 0 && lengthProto >= (INT32_MAX / stuff->height))
+ return BadLength;
+
+ if (((((lengthProto * stuff->height) + (unsigned)3) >> 2) +