ghostscript: fix CVE-2020-15900
PATCH 1/4 ghostscript: fix CVE-2020-15900
From: Lee Chee Yang <[email protected]>
Signed-off-by Lee Chee Yang <[email protected]>
--- .../ghostscript/CVE-2020-15900.patch | 54 +++++++++++++++++++ .../ghostscript/ghostscript_9.50.bb | 1 + 2 files changed, 55 insertions(+) create mode 100644 meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch
meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch new file +54 -0
@@ -0,0 +1,54 @@ +From 5d499272b95a6b890a1397e11d20937de000d31b Mon Sep 17 00:00:00 2001 +From: Ray Johnston <[email protected]> +Date: Wed, 22 Jul 2020 09:57:54 -0700 +Subject: [PATCH] Bug 702582, CVE 2020-15900 Memory Corruption in Ghostscript + 9.52 + +Fix the 'rsearch' calculation for the 'post' size to give the correct +size. Previous calculation would result in a size that was too large, +and could underflow to max uint32_t. Also fix 'rsearch' to return the +correct 'pre' string with empty string match. + +A future change may 'undefine' this undocumented, non-standard operator +during initialization as we do with the many other non-standard internal +PostScript operators and procedures. + +Upstream-Status: Backport [https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5d499272b95a6b890a1397e11d20937de000d31b] +CVE: CVE-2020-15900 +Signed-off-by: Chee Yang Lee <[email protected]> +--- + psi/zstring.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/psi/zstring.c b/psi/zstring.c +index 33662dafa..58e1af2b3 100644 +--- a/psi/zstring.c ++++ b/psi/zstring.c +@@ -142,13 +142,18 @@ search_impl(i_ctx_t *i_ctx_p, bool forward) + return 0; + found: + op->tas.type_attrs = op1->tas.type_attrs; +- op->value.bytes = ptr; +- r_set_size(op, size); ++ op->value.bytes = ptr; /* match */ ++ op->tas.rsize = size; /* match */ + push(2); +- op[-1] = *op1; +- r_set_size(op - 1, ptr - op[-1].value.bytes); +- op1->value.bytes = ptr + size; +- r_set_size(op1, count + (!forward ? (size - 1) : 0)); ++ op[-1] = *op1; /* pre */ ++ op[-3].value.bytes = ptr + size; /* post */ ++ if (forward) { ++ op[-1].tas.rsize = ptr - op[-1].value.bytes; /* pre */ ++ op[-3].tas.rsize = count; /* post */ ++ } else { ++ op[-1].tas.rsize = count; /* pre */ ++ op[-3].tas.rsize -= count + size; /* post */ ++ } + make_true(op); + return 0; + } +-- +2.17.1 +
meta/recipes-extended/ghostscript/ghostscript_9.50.bb +1 -0
@@ -26,6 +26,7 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d file://avoid-host-contamination.patch \ file://mkdir-p.patch \ file://CVE-2019-14869-0001.patch \ + file://CVE-2020-15900.patch \ " SRC_URI = "${SRC_URI_BASE} \
Signature · 1 line
2.17.1
PATCH 2/4 qemu: fix CVE-2020-15863
From: Lee Chee Yang <[email protected]>
Signed-off-by Lee Chee Yang <[email protected]>
--- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2020-15863.patch | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-15863.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -44,6 +44,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2020-13659.patch \ file://CVE-2020-13800.patch \ file://CVE-2020-13362.patch \ + file://CVE-2020-15863.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/CVE-2020-15863.patch new file +63 -0
63 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 3/4 libjpeg-turbo: fix CVE-2020-13790
In reply to Lee Chee YangFrom: Lee Chee Yang <[email protected]>
Signed-off-by Lee Chee Yang <[email protected]>
--- .../jpeg/files/CVE-2020-13790.patch | 76 +++++++++++++++++++ .../jpeg/libjpeg-turbo_2.0.4.bb | 1 + 2 files changed, 77 insertions(+) create mode 100644 meta/recipes-graphics/jpeg/files/CVE-2020-13790.patch
meta/recipes-graphics/jpeg/files/CVE-2020-13790.patch new file +76 -0
@@ -0,0 +1,76 @@ +From 07caad7e0a9afb372e0608299fb3e832cc78495f Mon Sep 17 00:00:00 2001 +From: DRC <[email protected]> +Date: Tue, 2 Jun 2020 14:15:37 -0500 +Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM + +This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to +include binary PPM files with maximum values < 255, thus preventing a +malformed binary PPM input file with those specifications from +triggering an overrun of the rescale array and potentially crashing +cjpeg, TJBench, or any program that uses the tjLoadImage() function. + +Fixes #433 + +Upstream-Status: Backport [https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3de15e0c344d11d4b90f4a47136467053eb2d09a] +CVE: CVE-2020-13790 +Signed-off-by: Chee Yang Lee <[email protected]> + +--- + ChangeLog.md | 14 ++++++++++---- + rdppm.c | 4 ++-- + 2 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/ChangeLog.md b/ChangeLog.md +index 4d1219e..af660ab 100644 +--- a/ChangeLog.md ++++ b/ChangeLog.md +@@ -38,6 +38,12 @@ this issue did not likely pose a security risk. + separate read-only data section rather than in the text section, to support + execute-only memory layouts. + ++3. Fixed an issue in the PPM reader that caused a buffer overrun in cjpeg, ++TJBench, or the `tjLoadImage()` function if one of the values in a binary ++PPM/PGM input file exceeded the maximum value defined in the file's header and ++that maximum value was less than 255. libjpeg-turbo 1.5.0 already included a ++similar fix for binary PPM/PGM files with maximum values greater than 255. ++ + + 2.0.3 + ===== +@@ -562,10 +568,10 @@ application was linked against. + + 3. Fixed a couple of issues in the PPM reader that would cause buffer overruns + in cjpeg if one of the values in a binary PPM/PGM input file exceeded the +-maximum value defined in the file's header. libjpeg-turbo 1.4.2 already +-included a similar fix for ASCII PPM/PGM files. Note that these issues were +-not security bugs, since they were confined to the cjpeg program and did not +-affect any of the libjpeg-turbo libraries. ++maximum value defined in the file's header and that maximum value was greater ++than 255. libjpeg-turbo 1.4.2 already included a similar fix for ASCII PPM/PGM ++files. Note that these issues were not security bugs, since they were confined ++to the cjpeg program and did not affect any of the libjpeg-turbo libraries. + + 4. Fixed an issue whereby attempting to decompress a JPEG file with a corrupt + header using the `tjDecompressToYUV2()` function would cause the function to +diff --git a/rdppm.c b/rdppm.c +index 87bc330..a8507b9 100644 +--- a/rdppm.c ++++ b/rdppm.c +@@ -5,7 +5,7 @@ + * Copyright (C) 1991-1997, Thomas G. Lane. + * Modified 2009 by Bill Allombert, Guido Vollbeding. + * libjpeg-turbo Modifications: +- * Copyright (C) 2015-2017, D. R. Commander. ++ * Copyright (C) 2015-2017, 2020, D. R. Commander. + * For conditions of distribution and use, see the accompanying README.ijg + * file. + * +@@ -720,7 +720,7 @@ start_input_ppm(j_compress_ptr cinfo, cjpeg_source_ptr sinfo) + /* On 16-bit-int machines we have to be careful of maxval = 65535 */ + source->rescale = (JSAMPLE *) + (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, +- (size_t)(((long)maxval + 1L) * ++ (size_t)(((long)MAX(maxval, 255) + 1L) * + sizeof(JSAMPLE))); + half_maxval = maxval / 2; + for (val = 0; val <= (long)maxval; val++) {
meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.4.bb +1 -0
@@ -12,6 +12,7 @@ DEPENDS_append_x86_class-target = " nasm-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0001-libjpeg-turbo-fix-package_qa-error.patch \ + file://CVE-2020-13790.patch \ " SRC_URI[md5sum] = "d01d9e0c28c27bc0de9f4e2e8ff49855"
Signature · 1 line
2.17.1
PATCH 4/4 webkitgtk: fix CVE-2020-13753
In reply to Lee Chee YangFrom: Lee Chee Yang <[email protected]>
Signed-off-by Lee Chee Yang <[email protected]>
--- .../webkit/webkitgtk/CVE-2020-13753.patch | 15 +++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.28.2.bb | 1 + 2 files changed, 16 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/CVE-2020-13753.patch
meta/recipes-sato/webkit/webkitgtk/CVE-2020-13753.patch new file +15 -0
@@ -0,0 +1,15 @@ +Upstream-Status: Backport [https://trac.webkit.org/changeset/262368/webkit?format=diff&new=262368] +CVE: CVE-2020-13753 +Signed-off-by: Chee Yang Lee <[email protected]> + +Index: a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp +=================================================================== +--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (revision 262367) ++++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (revision 262368) +@@ -642,5 +642,5 @@ + int r; + if (rule.arg) +- r = seccomp_rule_add(seccomp, SCMP_ACT_ERRNO(EPERM), scall, 1, rule.arg); ++ r = seccomp_rule_add(seccomp, SCMP_ACT_ERRNO(EPERM), scall, 1, *rule.arg); + else + r = seccomp_rule_add(seccomp, SCMP_ACT_ERRNO(EPERM), scall, 0);
meta/recipes-sato/webkit/webkitgtk_2.28.2.bb +1 -0
@@ -19,6 +19,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://cross-compile.patch \ file://0001-Fix-build-with-musl.patch \ file://include_array.patch \ + file://CVE-2020-13753.patch \ " SRC_URI[md5sum] = "ec0ef870ca37e3a5ebbead2f268a28ec" SRC_URI[sha256sum] = "b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc68c30bd"
Signature · 1 line
2.17.1