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:17:03 -0800 |
commit | f749fd990c7f91799780369b0ecb80366e8ab418 (patch) | |
tree | 983578c4040d5de8bbc2b1fd9d38b32efa9c429a /meta/recipes-extended/ghostscript/ghostscript | |
parent | 4fb2ba48f2ebaf9060bdd7ada8ab257c9b150603 (diff) | |
download | poky-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/ghostscript/ghostscript')
-rw-r--r-- | meta/recipes-extended/ghostscript/ghostscript/CVE-2016-7977.patch | 33 |
1 files changed, 0 insertions, 33 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 @@ | |||
1 | From 8abd22010eb4db0fb1b10e430d5f5d83e015ef70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chris Liddell <chris.liddell@artifex.com> | ||
3 | Date: Mon, 3 Oct 2016 01:46:28 +0100 | ||
4 | Subject: [PATCH] Bug 697169: Be rigorous with SAFER permissions | ||
5 | |||
6 | Once we've opened our input file from the command line, enforce the SAFER | ||
7 | rules. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | CVE: CVE-2016-7977 | ||
11 | |||
12 | Signed-off-by: Catalin Enache <catalin.enache@windriver.com> | ||
13 | --- | ||
14 | psi/zfile.c | 3 +++ | ||
15 | 1 file changed, 3 insertions(+) | ||
16 | |||
17 | diff --git a/psi/zfile.c b/psi/zfile.c | ||
18 | index 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 | -- | ||
32 | 2.10.2 | ||
33 | |||