diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-03-08 20:17:45 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-09 09:16:02 -0800 |
| commit | 1fc1a5f392ec6773cd520cbbd19b58931c6a2d66 (patch) | |
| tree | afc1082bf4a8406601bd9f6585db81db53ac13df | |
| parent | 49437de120ffdf26396fb295254f51ccc204560a (diff) | |
| download | openembedded-core-1fc1a5f392ec6773cd520cbbd19b58931c6a2d66.tar.gz openembedded-core-1fc1a5f392ec6773cd520cbbd19b58931c6a2d66.tar.bz2 openembedded-core-1fc1a5f392ec6773cd520cbbd19b58931c6a2d66.zip | |
ghostscript: drop incorrectly applied patch
The patch was adding a change to the source file that was already there,
so the lines of code were repeated twice. This didn't create a bug or a
security issue, but it may well have.
Long story:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript_9.21.bb | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch b/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch deleted file mode 100644 index b7eed1241e..0000000000 --- a/meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8abd22010eb4db0fb1b10e430d5f5d83e015ef70 Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Mon, 3 Oct 2016 01:46:28 +0100 -Subject: [PATCH] Bug 697169: Be rigorous with SAFER permissions - -Once we've opened our input file from the command line, enforce the SAFER -rules. - -Upstream-Status: Backport -CVE: CVE-2016-7977 - -Signed-off-by: Catalin Enache <catalin.enache@windriver.com> ---- - psi/zfile.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/psi/zfile.c b/psi/zfile.c -index b6caea2..2c6c958 100644 ---- a/psi/zfile.c -+++ b/psi/zfile.c -@@ -1081,6 +1081,9 @@ lib_file_open(gs_file_path_ptr lib_path, const gs_memory_t *mem, i_ctx_t *i_ctx - gs_main_instance *minst = get_minst_from_memory(mem); - int code; - -+ if (i_ctx_p && starting_arg_file) -+ i_ctx_p->starting_arg_file = false; -+ - /* when starting arg files (@ files) iodev_default is not yet set */ - if (iodev == 0) - iodev = (gx_io_device *)gx_io_device_table[0]; --- -2.10.2 - diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.21.bb b/meta/recipes-extended/ghostscript/ghostscript_9.21.bb index bf985c44a3..50ec7e20c5 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.21.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.21.bb @@ -32,7 +32,6 @@ SRC_URI = "${SRC_URI_BASE} \ file://ghostscript-9.02-genarch.patch \ file://objarch.h \ file://cups-no-gcrypt.patch \ - file://CVE-2016-7977.patch \ file://CVE-2017-7207.patch \ file://CVE-2017-5951.patch \ file://CVE-2017-7975.patch \ |