summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch38
-rw-r--r--meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb3
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch b/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch
new file mode 100644
index 0000000000..0779c26dcd
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch
@@ -0,0 +1,38 @@
1From 2deda9906480f9c8ae07b8c2a5510cc7e4c59a8e Mon Sep 17 00:00:00 2001
2From: Alan Coopersmith <alan.coopersmith@oracle.com>
3Date: Fri, 6 Feb 2015 15:50:45 -0800
4Subject: [PATCH] bdfReadProperties: property count needs range check
5 [CVE-2015-1802]
6
7Avoid integer overflow or underflow when allocating memory arrays
8by multiplying the number of properties reported for a BDF font.
9
10Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
11Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
12Reviewed-by: Julien Cristau <jcristau@debian.org>
13
14Upstream-Status: backport
15
16Signed-off-by: Li Zhou <li.zhou@windriver.com>
17---
18 src/bitmap/bdfread.c | 4 +++-
19 1 file changed, 3 insertions(+), 1 deletion(-)
20
21diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
22index 914a024..6387908 100644
23--- a/src/bitmap/bdfread.c
24+++ b/src/bitmap/bdfread.c
25@@ -604,7 +604,9 @@ bdfReadProperties(FontFilePtr file, FontPtr pFont, bdfFileState *pState)
26 bdfError("missing 'STARTPROPERTIES'\n");
27 return (FALSE);
28 }
29- if (sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) {
30+ if ((sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) ||
31+ (nProps <= 0) ||
32+ (nProps > ((INT32_MAX / sizeof(FontPropRec)) - BDF_GENPROPS))) {
33 bdfError("bad 'STARTPROPERTIES'\n");
34 return (FALSE);
35 }
36--
371.7.9.5
38
diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb
index ef0bde29fb..4a3c9b7db7 100644
--- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb
@@ -18,5 +18,8 @@ XORG_PN = "libXfont"
18 18
19BBCLASSEXTEND = "native" 19BBCLASSEXTEND = "native"
20 20
21SRC_URI += "file://0001-bdfReadProperties-property-count-needs-range-check-C.patch \
22 "
23
21SRC_URI[md5sum] = "664629bfa7cdf8b984155019fd395dcb" 24SRC_URI[md5sum] = "664629bfa7cdf8b984155019fd395dcb"
22SRC_URI[sha256sum] = "3a3c52c4adf9352b2160f07ff0596af17ab14f91d6509564e606678a1261c25f" 25SRC_URI[sha256sum] = "3a3c52c4adf9352b2160f07ff0596af17ab14f91d6509564e606678a1261c25f"