diff options
author | Lee Chee Yang <chee.yang.lee@intel.com> | 2020-08-07 17:45:16 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-12 10:53:46 +0100 |
commit | fa2385ad96a79ffbdad6c7084378848576e082a1 (patch) | |
tree | 541df8d2a36ed19c832a71b089f86117d0f3abe4 /meta | |
parent | e075e02f505c01dd1638c9edd8d7da2fb97e15a3 (diff) | |
download | poky-fa2385ad96a79ffbdad6c7084378848576e082a1.tar.gz |
ghostscript: fix CVE-2020-15900
(From OE-Core rev: a58aa3017925617da1eec732a0e68bfda83410a1)
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch | 54 | ||||
-rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.50.bb | 1 |
2 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch new file mode 100644 index 0000000000..d7c5f034e5 --- /dev/null +++ b/meta/recipes-extended/ghostscript/ghostscript/CVE-2020-15900.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From 5d499272b95a6b890a1397e11d20937de000d31b Mon Sep 17 00:00:00 2001 | ||
2 | From: Ray Johnston <ray.johnston@artifex.com> | ||
3 | Date: Wed, 22 Jul 2020 09:57:54 -0700 | ||
4 | Subject: [PATCH] Bug 702582, CVE 2020-15900 Memory Corruption in Ghostscript | ||
5 | 9.52 | ||
6 | |||
7 | Fix the 'rsearch' calculation for the 'post' size to give the correct | ||
8 | size. Previous calculation would result in a size that was too large, | ||
9 | and could underflow to max uint32_t. Also fix 'rsearch' to return the | ||
10 | correct 'pre' string with empty string match. | ||
11 | |||
12 | A future change may 'undefine' this undocumented, non-standard operator | ||
13 | during initialization as we do with the many other non-standard internal | ||
14 | PostScript operators and procedures. | ||
15 | |||
16 | Upstream-Status: Backport [https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=5d499272b95a6b890a1397e11d20937de000d31b] | ||
17 | CVE: CVE-2020-15900 | ||
18 | Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> | ||
19 | --- | ||
20 | psi/zstring.c | 17 +++++++++++------ | ||
21 | 1 file changed, 11 insertions(+), 6 deletions(-) | ||
22 | |||
23 | diff --git a/psi/zstring.c b/psi/zstring.c | ||
24 | index 33662dafa..58e1af2b3 100644 | ||
25 | --- a/psi/zstring.c | ||
26 | +++ b/psi/zstring.c | ||
27 | @@ -142,13 +142,18 @@ search_impl(i_ctx_t *i_ctx_p, bool forward) | ||
28 | return 0; | ||
29 | found: | ||
30 | op->tas.type_attrs = op1->tas.type_attrs; | ||
31 | - op->value.bytes = ptr; | ||
32 | - r_set_size(op, size); | ||
33 | + op->value.bytes = ptr; /* match */ | ||
34 | + op->tas.rsize = size; /* match */ | ||
35 | push(2); | ||
36 | - op[-1] = *op1; | ||
37 | - r_set_size(op - 1, ptr - op[-1].value.bytes); | ||
38 | - op1->value.bytes = ptr + size; | ||
39 | - r_set_size(op1, count + (!forward ? (size - 1) : 0)); | ||
40 | + op[-1] = *op1; /* pre */ | ||
41 | + op[-3].value.bytes = ptr + size; /* post */ | ||
42 | + if (forward) { | ||
43 | + op[-1].tas.rsize = ptr - op[-1].value.bytes; /* pre */ | ||
44 | + op[-3].tas.rsize = count; /* post */ | ||
45 | + } else { | ||
46 | + op[-1].tas.rsize = count; /* pre */ | ||
47 | + op[-3].tas.rsize -= count + size; /* post */ | ||
48 | + } | ||
49 | make_true(op); | ||
50 | return 0; | ||
51 | } | ||
52 | -- | ||
53 | 2.17.1 | ||
54 | |||
diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.50.bb b/meta/recipes-extended/ghostscript/ghostscript_9.50.bb index 39c32644db..662db72b5e 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.50.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.50.bb | |||
@@ -26,6 +26,7 @@ SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/d | |||
26 | file://avoid-host-contamination.patch \ | 26 | file://avoid-host-contamination.patch \ |
27 | file://mkdir-p.patch \ | 27 | file://mkdir-p.patch \ |
28 | file://CVE-2019-14869-0001.patch \ | 28 | file://CVE-2019-14869-0001.patch \ |
29 | file://CVE-2020-15900.patch \ | ||
29 | " | 30 | " |
30 | 31 | ||
31 | SRC_URI = "${SRC_URI_BASE} \ | 32 | SRC_URI = "${SRC_URI_BASE} \ |