From 6b9df6cae0a8eca72005e14f370807816a704fcf Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 1 May 2015 23:38:44 +0200 Subject: Security fixes: X.Org CVE-2015-3418: v3: backport to 3.5.0.x branch. (Mihai Moldovan) Adds: - 1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch --- ...18-dix-Allow-zero-height-PutImage-re.full.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 debian/patches/1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch (limited to 'debian/patches/1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch') 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 new file mode 100644 index 000000000..7b6f28c00 --- /dev/null +++ b/debian/patches/1210-CVE-2015-3418-dix-Allow-zero-height-PutImage-re.full.patch @@ -0,0 +1,29 @@ +commit dba779d9f99ab2fc6bf05c78515dbdd82840cadd +Author: Keith Packard +Date: Fri May 1 13:09:24 2015 +0200 + + dix: Allow zero-height PutImage requests (fix for X.Org's CVE-2015-3418). + + The length checking code validates PutImage height and byte width by + making sure that byte-width >= INT32_MAX / height. If height is zero, + this generates a divide by zero exception. Allow zero height requests + explicitly, bypassing the INT32_MAX check. + + Fix for regression introduced by fix for CVE-2014-8092. + + v2: backports to nx-libs 3.6.x (Mike Gabriel) + Signed-off-by: Keith Packard + +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) + + 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) + -- cgit v1.2.3