summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-03-08 20:17:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:03 -0800
commitf749fd990c7f91799780369b0ecb80366e8ab418 (patch)
tree983578c4040d5de8bbc2b1fd9d38b32efa9c429a /meta/recipes-extended
parent4fb2ba48f2ebaf9060bdd7ada8ab257c9b150603 (diff)
downloadpoky-f749fd990c7f91799780369b0ecb80366e8ab418.tar.gz
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 (From OE-Core rev: 1fc1a5f392ec6773cd520cbbd19b58931c6a2d66) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch33
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_9.21.bb1
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 @@
1From 8abd22010eb4db0fb1b10e430d5f5d83e015ef70 Mon Sep 17 00:00:00 2001
2From: Chris Liddell <chris.liddell@artifex.com>
3Date: Mon, 3 Oct 2016 01:46:28 +0100
4Subject: [PATCH] Bug 697169: Be rigorous with SAFER permissions
5
6Once we've opened our input file from the command line, enforce the SAFER
7rules.
8
9Upstream-Status: Backport
10CVE: CVE-2016-7977
11
12Signed-off-by: Catalin Enache <catalin.enache@windriver.com>
13---
14 psi/zfile.c | 3 +++
15 1 file changed, 3 insertions(+)
16
17diff --git a/psi/zfile.c b/psi/zfile.c
18index b6caea2..2c6c958 100644
19--- a/psi/zfile.c
20+++ b/psi/zfile.c
21@@ -1081,6 +1081,9 @@ lib_file_open(gs_file_path_ptr lib_path, const gs_memory_t *mem, i_ctx_t *i_ctx
22 gs_main_instance *minst = get_minst_from_memory(mem);
23 int code;
24
25+ if (i_ctx_p && starting_arg_file)
26+ i_ctx_p->starting_arg_file = false;
27+
28 /* when starting arg files (@ files) iodev_default is not yet set */
29 if (iodev == 0)
30 iodev = (gx_io_device *)gx_io_device_table[0];
31--
322.10.2
33
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} \
32 file://ghostscript-9.02-genarch.patch \ 32 file://ghostscript-9.02-genarch.patch \
33 file://objarch.h \ 33 file://objarch.h \
34 file://cups-no-gcrypt.patch \ 34 file://cups-no-gcrypt.patch \
35 file://CVE-2016-7977.patch \
36 file://CVE-2017-7207.patch \ 35 file://CVE-2017-7207.patch \
37 file://CVE-2017-5951.patch \ 36 file://CVE-2017-5951.patch \
38 file://CVE-2017-7975.patch \ 37 file://CVE-2017-7975.patch \