diff options
| author |   Li Zhou <li.zhou@windriver.com> | 2015-04-23 17:20:06 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-28 07:56:56 +0100 |
| commit | 1abe1160dacdf892f1379cdd8b1884077611498d (patch) | |
| tree | 59577cb06eb16f2b25e0390da93ffb537bc0aaa4 | |
| parent | d812d32ee64430c60d354f1482642e49a207b871 (diff) | |
| download | openembedded-core-contrib-1abe1160dacdf892f1379cdd8b1884077611498d.tar.gz | |
libxfont: Security Advisory - libxfont - CVE-2015-1802
bdfReadProperties: property count needs range check
Avoid integer overflow or underflow when allocating memory arrays
by multiplying the number of properties reported for a BDF font.
(From OE-Core rev: 0ff9f2bf0e44a7b47a98234a12714c780825e286)
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxfont/0001-bdfReadProperties-property-count-needs-range-check-C.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxfont_1.5.0.bb | 3 |
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 @@ +From 2deda9906480f9c8ae07b8c2a5510cc7e4c59a8e Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri, 6 Feb 2015 15:50:45 -0800 +Subject: [PATCH] bdfReadProperties: property count needs range check + [CVE-2015-1802] + +Avoid integer overflow or underflow when allocating memory arrays +by multiplying the number of properties reported for a BDF font. + +Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Reviewed-by: Julien Cristau <jcristau@debian.org> + +Upstream-Status: backport + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + src/bitmap/bdfread.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c +index 914a024..6387908 100644 +--- a/src/bitmap/bdfread.c ++++ b/src/bitmap/bdfread.c +@@ -604,7 +604,9 @@ bdfReadProperties(FontFilePtr file, FontPtr pFont, bdfFileState *pState) + bdfError("missing 'STARTPROPERTIES'\n"); + return (FALSE); + } +- if (sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) { ++ if ((sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) || ++ (nProps <= 0) || ++ (nProps > ((INT32_MAX / sizeof(FontPropRec)) - BDF_GENPROPS))) { + bdfError("bad 'STARTPROPERTIES'\n"); + return (FALSE); + } +-- +1.7.9.5 + 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" BBCLASSEXTEND = "native" +SRC_URI += "file://0001-bdfReadProperties-property-count-needs-range-check-C.patch \ + " + SRC_URI[md5sum] = "664629bfa7cdf8b984155019fd395dcb" SRC_URI[sha256sum] = "3a3c52c4adf9352b2160f07ff0596af17ab14f91d6509564e606678a1261c25f" |