diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-11-19 15:40:00 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-11-28 14:24:08 +0100 |
| commit | 6198d34e0d7a0907d4650904bd41702bb51da0f5 (patch) | |
| tree | 39f1eac138a07451a2ff98ac7158342c19dd76ab /gnu/packages/patches/libxfont-CVE-2017-13722.patch | |
| parent | 61bed157075b23bc29d6859e4755ebaafac0d77a (diff) | |
| download | guix-6198d34e0d7a0907d4650904bd41702bb51da0f5.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/patches/libxfont-CVE-2017-13722.patch')
| -rw-r--r-- | gnu/packages/patches/libxfont-CVE-2017-13722.patch | 53 |
1 files changed, 0 insertions, 53 deletions
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: -<https://cgit.freedesktop.org/xorg/lib/libXfont/commit/?id=672bb944311392e2415b39c0d63b1e1902905bcd> - -From 672bb944311392e2415b39c0d63b1e1902905bcd Mon Sep 17 00:00:00 2001 -From: Michal Srb <msrb@suse.com> -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 <jcristau@debian.org> - -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 <stdarg.h> - #include <stdint.h> -+#include <string.h> - - 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 - |