From 6198d34e0d7a0907d4650904bd41702bb51da0f5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 Nov 2017 15:40:00 +0100 Subject: gnu: libxfont2: Update to 2.0.2. * gnu/packages/xorg.scm (libxfont2): Update to 2.0.2. [source](patches): Remove. * gnu/packages/patches/libxfont-CVE-2017-13720.patch, gnu/packages/patches/libxfont-CVE-2017-13722.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- gnu/local.mk | 2 - gnu/packages/patches/libxfont-CVE-2017-13720.patch | 36 --------------- gnu/packages/patches/libxfont-CVE-2017-13722.patch | 53 ---------------------- gnu/packages/xorg.scm | 6 +-- 4 files changed, 2 insertions(+), 95 deletions(-) delete mode 100644 gnu/packages/patches/libxfont-CVE-2017-13720.patch delete mode 100644 gnu/packages/patches/libxfont-CVE-2017-13722.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9447c479e4..15f673c046 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -822,8 +822,6 @@ dist_patch_DATA = \ %D%/packages/patches/libvirt-CVE-2017-1000256.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libxcb-python-3.5-compat.patch \ - %D%/packages/patches/libxfont-CVE-2017-13720.patch \ - %D%/packages/patches/libxfont-CVE-2017-13722.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/libxt-guix-search-paths.patch \ %D%/packages/patches/lierolibre-check-unaligned-access.patch \ diff --git a/gnu/packages/patches/libxfont-CVE-2017-13720.patch b/gnu/packages/patches/libxfont-CVE-2017-13720.patch deleted file mode 100644 index 0936171060..0000000000 --- a/gnu/packages/patches/libxfont-CVE-2017-13720.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix CVE-2017-13720. - -Copied from upstream source repository: - - - -From d1e670a4a8704b8708e493ab6155589bcd570608 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Thu, 20 Jul 2017 13:38:53 +0200 -Subject: Check for end of string in PatternMatch (CVE-2017-13720) - -If a pattern contains '?' character, any character in the string is skipped, -even if it is '\0'. The rest of the matching then reads invalid memory. - -Reviewed-by: Peter Hutterer -Signed-off-by: Julien Cristau - -diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c -index 4ce2473..996b7d1 100644 ---- a/src/fontfile/fontdir.c -+++ b/src/fontfile/fontdir.c -@@ -400,8 +400,10 @@ PatternMatch(char *pat, int patdashes, char *string, int stringdashes) - } - } - case '?': -- if (*string++ == XK_minus) -+ if ((t = *string++) == XK_minus) - stringdashes--; -+ if (!t) -+ return 0; - break; - case '\0': - return (*string == '\0'); --- -cgit v0.10.2 - diff --git a/gnu/packages/patches/libxfont-CVE-2017-13722.patch b/gnu/packages/patches/libxfont-CVE-2017-13722.patch deleted file mode 100644 index 458fdfd1a7..0000000000 --- a/gnu/packages/patches/libxfont-CVE-2017-13722.patch +++ /dev/null @@ -1,53 +0,0 @@ -Fix CVE-2017-13722. - -Copied from upstream source repository: - - -From 672bb944311392e2415b39c0d63b1e1902905bcd Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Thu, 20 Jul 2017 17:05:23 +0200 -Subject: pcfGetProperties: Check string boundaries (CVE-2017-13722) - -Without the checks a malformed PCF file can cause the library to make -atom from random heap memory that was behind the `strings` buffer. -This may crash the process or leak information. - -Signed-off-by: Julien Cristau - -diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c -index dab1c44..ae34c28 100644 ---- a/src/bitmap/pcfread.c -+++ b/src/bitmap/pcfread.c -@@ -45,6 +45,7 @@ from The Open Group. - - #include - #include -+#include - - void - pcfError(const char* message, ...) -@@ -311,11 +312,19 @@ pcfGetProperties(FontInfoPtr pFontInfo, FontFilePtr file, - if (IS_EOF(file)) goto Bail; - position += string_size; - for (i = 0; i < nprops; i++) { -+ if (props[i].name >= string_size) { -+ pcfError("pcfGetProperties(): String starts out of bounds (%ld/%d)\n", props[i].name, string_size); -+ goto Bail; -+ } - props[i].name = MakeAtom(strings + props[i].name, -- strlen(strings + props[i].name), TRUE); -+ strnlen(strings + props[i].name, string_size - props[i].name), TRUE); - if (isStringProp[i]) { -+ if (props[i].value >= string_size) { -+ pcfError("pcfGetProperties(): String starts out of bounds (%ld/%d)\n", props[i].value, string_size); -+ goto Bail; -+ } - props[i].value = MakeAtom(strings + props[i].value, -- strlen(strings + props[i].value), TRUE); -+ strnlen(strings + props[i].value, string_size - props[i].value), TRUE); - } - } - free(strings); --- -cgit v0.10.2 - diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 04cd65481d..adf2dffff8 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4891,16 +4891,14 @@ new API's in libXft, or the legacy API's in libX11.") (define-public libxfont2 (package (inherit libxfont) - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libXfont2-" version ".tar.bz2")) - (patches (search-patches "libxfont-CVE-2017-13720.patch" - "libxfont-CVE-2017-13722.patch")) (sha256 (base32 - "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9")))))) + "04f1lswh1ridkycgaivf1hrr77l5ap8smbfr2rqjrm7phwxqs24l")))))) (define-public libxi (package -- cgit v1.2.3