Skip to contentSkip to conversation

package/ghostscript: security bump to version 9.27

PATCH New Baruch Siach 2 participants 3 messages Apr 10, 2019 – Apr 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/ghostscript: security bump to version 9.27

Fixes CVE-2019-3835, CVE-2019-3838: A specially crafted PostScript file could use these flaws to have access to the file system outside of the constrains imposed by -dSAFER.

Drop upstream patches.

Use the make subst function to compute the download site from version.

---
 ...nitize-op-stack-for-error-conditions.patch | 176 ------
 ...rocedures-that-call-.force-operators.patch | 441 -------------
 ...700317-Fix-logic-for-an-older-change.patch |  31 -
 ...Harden-some-uses-of-.force-operators.patch | 135 ----
 ...-bunch-of-gs_fonts.ps-specific-procs.patch | 587 ------------------
 ....forcedef-and-harden-.force-ops-more.patch | 345 ----------
 package/ghostscript/ghostscript.hash          |   4 +-
 package/ghostscript/ghostscript.mk            |   4 +-
 8 files changed, 4 insertions(+), 1719 deletions(-)
 delete mode 100644 package/ghostscript/0002-Sanitize-op-stack-for-error-conditions.patch
 delete mode 100644 package/ghostscript/0003-Any-transient-procedures-that-call-.force-operators.patch
 delete mode 100644 package/ghostscript/0004-Bug700317-Fix-logic-for-an-older-change.patch
 delete mode 100644 package/ghostscript/0005-Harden-some-uses-of-.force-operators.patch
 delete mode 100644 package/ghostscript/0006-Undefine-a-bunch-of-gs_fonts.ps-specific-procs.patch
 delete mode 100644 package/ghostscript/0007-Remove-.forcedef-and-harden-.force-ops-more.patch
package/ghostscript/0002-Sanitize-op-stack-for-error-conditions.patch deleted +0 -176
deleted file mode 100644
index 7909cfec70cb..000000000000
@@ -1,176 +0,0 @@
-From a1de1e6ab51ab37a17975aad1193f2523e7e7e84 Mon Sep 17 00:00:00 2001
-From: Chris Liddell <[email protected]>
-Date: Wed, 5 Dec 2018 12:22:13 +0000
-Subject: [PATCH] Sanitize op stack for error conditions
-
-We save the stacks to an array and store the array for the error handler to
-access.
-
-For SAFER, we traverse the array, and deep copy any op arrays (procedures). As
-we make these copies, we check for operators that do *not* exist in systemdict,
-when we find one, we replace the operator with a name object (of the form
-"/--opname--").
-
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: commit 13b0a36f818
-
- psi/int.mak  |  3 +-
- psi/interp.c |  8 ++++++
- psi/istack.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- psi/istack.h |  3 ++
- 4 files changed, 91 insertions(+), 1 deletion(-)
-
-diff --git a/psi/int.mak b/psi/int.mak
-index 6ab5bf0069dd..6b349cb042dd 100644
---- a/psi/int.mak
-+++ b/psi/int.mak
-@@ -204,7 +204,8 @@ $(PSOBJ)iparam.$(OBJ) : $(PSSRC)iparam.c $(GH)\
- $(PSOBJ)istack.$(OBJ) : $(PSSRC)istack.c $(GH) $(memory__h)\
-  $(ierrors_h) $(gsstruct_h) $(gsutil_h)\
-  $(ialloc_h) $(istack_h) $(istkparm_h) $(istruct_h) $(iutil_h) $(ivmspace_h)\
-- $(store_h) $(INT_MAK) $(MAKEDIRS)
-+ $(store_h) $(icstate_h) $(iname_h) $(dstack_h) $(idict_h) \
-+ $(INT_MAK) $(MAKEDIRS)
- 	$(PSCC) $(PSO_)istack.$(OBJ) $(C_) $(PSSRC)istack.c
- 
- $(PSOBJ)iutil.$(OBJ) : $(PSSRC)iutil.c $(GH) $(math__h) $(memory__h) $(string__h)\
-diff --git a/psi/interp.c b/psi/interp.c
-index 6dc0ddae1b3c..aa5779c51420 100644
---- a/psi/interp.c
-+++ b/psi/interp.c
-@@ -761,6 +761,7 @@ copy_stack(i_ctx_t *i_ctx_p, const ref_stack_t * pstack, int skip, ref * arr)
-     uint size = ref_stack_count(pstack) - skip;
-     uint save_space = ialloc_space(idmemory);
-     int code, i;
-+    ref *safety, *safe;
- 
-     if (size > 65535)
-         size = 65535;
-@@ -778,6 +779,13 @@ copy_stack(i_ctx_t *i_ctx_p, const ref_stack_t * pstack, int skip, ref * arr)
-                 make_null(&arr->value.refs[i]);
-         }
-     }
-+    if (pstack == &o_stack && dict_find_string(systemdict, "SAFETY", &safety) > 0 &&
-+        dict_find_string(safety, "safe", &safe) > 0 && r_has_type(safe, t_boolean) &&
-+        safe->value.boolval == true) {
-+        code = ref_stack_array_sanitize(i_ctx_p, arr, arr);
-+        if (code < 0)
-+            return code;
-+    }
-     ialloc_set_space(idmemory, save_space);
-     return code;
- }
-diff --git a/psi/istack.c b/psi/istack.c
-index 8fe151fa5628..f1a3e511534d 100644
---- a/psi/istack.c
-+++ b/psi/istack.c
-@@ -27,6 +27,10 @@
- #include "iutil.h"
- #include "ivmspace.h"		/* for local/global test */
- #include "store.h"
-+#include "icstate.h"
-+#include "iname.h"
-+#include "dstack.h"
-+#include "idict.h"
- 
- /* Forward references */
- static void init_block(ref_stack_t *pstack, const ref *pblock_array,
-@@ -294,6 +298,80 @@ ref_stack_store_check(const ref_stack_t *pstack, ref *parray, uint count,
-     return 0;
- }
- 
-+int
-+ref_stack_array_sanitize(i_ctx_t *i_ctx_p, ref *sarr, ref *darr)
-+{
-+    int i, code;
-+    ref obj, arr2;
-+    ref *pobj2;
-+    gs_memory_t *mem = (gs_memory_t *)idmemory->current;
-+
-+    if (!r_is_array(sarr) || !r_has_type(darr, t_array))
-+        return_error(gs_error_typecheck);
-+
-+    for (i = 0; i < r_size(sarr); i++) {
-+        code = array_get(mem, sarr, i, &obj);
-+        if (code < 0)
-+            make_null(&obj);
-+        switch(r_type(&obj)) {
-+          case t_operator:
-+          {
-+            int index = op_index(&obj);
-+
-+            if (index > 0 && index < op_def_count) {
-+                const byte *data = (const byte *)(op_index_def(index)->oname + 1);
-+                if (dict_find_string(systemdict, (const char *)data, &pobj2) <= 0) {
-+                    byte *s = gs_alloc_bytes(mem, strlen((char *)data) + 5, "ref_stack_array_sanitize");
-+                    if (s) {
-+                        s[0] =  '\0';
-+                        strcpy((char *)s, "--");
-+                        strcpy((char *)s + 2, (char *)data);
-+                        strcpy((char *)s + strlen((char *)data) + 2, "--");
-+                    }
-+                    else {
-+                        s = (byte *)data;
-+                    }
-+                    code = name_ref(imemory, s, strlen((char *)s), &obj, 1);
-+                    if (code < 0) make_null(&obj);
-+                    if (s != data)
-+                        gs_free_object(mem, s, "ref_stack_array_sanitize");
-+                }
-+            }
-+            else {
-+                make_null(&obj);
-+            }
-+            ref_assign(darr->value.refs + i, &obj);
-+            break;
-+          }
-+          case t_array:
-+          case t_shortarray:
-+          case t_mixedarray:
-+          {
-+            int attrs = r_type_attrs(&obj) & (a_write | a_read | a_execute | a_executable);
-+            /* We only want to copy executable arrays */
-+            if (attrs & (a_execute | a_executable)) {
-+                code = ialloc_ref_array(&arr2, attrs, r_size(&obj), "ref_stack_array_sanitize");
-+                if (code < 0) {
-+                    make_null(&arr2);
-+                }
-+                else {
-+                    code = ref_stack_array_sanitize(i_ctx_p, &obj, &arr2);
-+                }
-+                ref_assign(darr->value.refs + i, &arr2);
-+            }
-+            else {
-+                ref_assign(darr->value.refs + i, &obj);
-+            }
-+            break;
-+          }
-+          default:
-+            ref_assign(darr->value.refs + i, &obj);
-+        }
-+    }
-+    return 0;
-+}
-+
-+
- /*
-  * Store the top 'count' elements of a stack, starting 'skip' elements below
-  * the top, into an array, with or without store/undo checking.  age=-1 for
-diff --git a/psi/istack.h b/psi/istack.h
-index 051dcbe216cf..54be405adfb3 100644
---- a/psi/istack.h
-+++ b/psi/istack.h
-@@ -129,6 +129,9 @@ int ref_stack_store(const ref_stack_t *pstack, ref *parray, uint count,
-                     uint skip, int age, bool check,
-                     gs_dual_memory_t *idmem, client_name_t cname);
- 
-+int
-+ref_stack_array_sanitize(i_ctx_t *i_ctx_p, ref *sarr, ref *darr);
-+
- /*
-  * Pop the top N elements off a stack.
-  * The number must not exceed the number of elements in use.
--- 
-2.20.1
-
package/ghostscript/0003-Any-transient-procedures-that-call-.force-operators.patch deleted +0 -441

441 lines not on this page · raw message

package/ghostscript/0004-Bug700317-Fix-logic-for-an-older-change.patch deleted +0 -31
deleted file mode 100644
index 65ebd44df2d9..000000000000
@@ -1,31 +0,0 @@
-From af9a9dceb7be7df743d55c4d078a1ae846b6f556 Mon Sep 17 00:00:00 2001
-From: Chris Liddell <[email protected]>
-Date: Sat, 15 Dec 2018 09:08:32 +0000
-Subject: [PATCH] Bug700317: Fix logic for an older change
-
-Unlike almost every other function in gs, dict_find_string() returns 1 on
-success 0 or <0 on failure. The logic for this case was wrong.
-
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: commit 99f13091a3
-
- psi/interp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/psi/interp.c b/psi/interp.c
-index aa5779c51420..f6c45bbe24dc 100644
---- a/psi/interp.c
-+++ b/psi/interp.c
-@@ -703,7 +703,7 @@ again:
-                  * i.e. it's an internal operator we have hidden
-                  */
-                 code = dict_find_string(systemdict, (const char *)bufptr, &tobj);
--                if (code < 0) {
-+                if (code <= 0) {
-                     buf[0] = buf[1] = buf[rlen + 2] = buf[rlen + 3] = '-';
-                     rlen += 4;
-                     bufptr = buf;
--- 
-2.20.1
-
package/ghostscript/0005-Harden-some-uses-of-.force-operators.patch deleted +0 -135

135 lines not on this page · raw message

package/ghostscript/0006-Undefine-a-bunch-of-gs_fonts.ps-specific-procs.patch deleted +0 -587

587 lines not on this page · raw message

package/ghostscript/0007-Remove-.forcedef-and-harden-.force-ops-more.patch deleted +0 -345

345 lines not on this page · raw message

package/ghostscript/ghostscript.hash +2 -2
index 15ef95e77a7d..383a414da405 100644
@@ -1,5 +1,5 @@
-# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926/SHA512SUMS
-sha512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e  ghostscript-9.26.tar.xz
+# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs927/SHA512SUMS
+sha512 5e67ad45a80f01c6ef0eabb1c76dfa8fb6e7f0fde8d82fd5daaf12f370c288a672f8fa69c74d9e30255582267e9a906e4e8b13655f8d993fefdfc8dbdb5d5401  ghostscript-9.27.tar.xz
 
 # Hash for license file:
 sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2  LICENSE
package/ghostscript/ghostscript.mk +2 -2
index 357fd08c3215..fefac2aee30a 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-GHOSTSCRIPT_VERSION = 9.26
-GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926
+GHOSTSCRIPT_VERSION = 9.27
+GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION))
 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz
 GHOSTSCRIPT_LICENSE = AGPL-3.0
 GHOSTSCRIPT_LICENSE_FILES = LICENSE
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/ghostscript: security bump to version 9.27

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Fixes CVE-2019-3835, CVE-2019-3838: A specially crafted PostScript file could use these flaws to have access to the file system outside of the constrains imposed by -dSAFER.

Quoted 6 lines

Drop upstream patches.

Use the make subst function to compute the download site from version.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/ghostscript: security bump to version 9.27

In reply to Baruch Siach
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Fixes CVE-2019-3835, CVE-2019-3838: A specially crafted PostScript file could use these flaws to have access to the file system outside of the constrains imposed by -dSAFER.

Quoted 6 lines

Drop upstream patches.

Use the make subst function to compute the download site from version.

Committed to 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard