summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-02-01 17:44:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-03 11:11:39 (GMT)
commit9a6a7150d9d027a36306b516c3549cbe00ab21a8 (patch)
treef66d769618d71979a1d80d12742461cf24ad5d74
parent37905e766386aa37d9d006d8cda41214230aae16 (diff)
downloadpoky-9a6a7150d9d027a36306b516c3549cbe00ab21a8.tar.gz
foomatic-filters: Security fix CVE-2015-8560
CVE-2015-8560 cups-filters: foomatic-rip did not consider semicolon as illegal shell escape character (From OE-Core master rev: 307056ce062bf4063f6effeb4c891c82c949c053) (From OE-Core rev: 4f92365ebfb382509d152dfe6220e225193645f1) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch23
-rw-r--r--meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb3
2 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch b/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch
new file mode 100644
index 0000000..dc973c4
--- /dev/null
+++ b/meta/recipes-extended/foomatic/foomatic-filters-4.0.17/CVE-2015-8560.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Backport
2
3
4http://bzr.linuxfoundation.org/loggerhead/openprinting/cups-filters/revision/7419
5
6Hand applied change to util.c. Fix was for cups-filters but also applied to foomatic-filters.
7
8CVE: CVE-2015-8560
9Signed-off-by: Armin Kuster <akuster@mvista.com>
10
11Index: util.c
12===================================================================
13--- a/util.c
14+++ b/util.c
15@@ -31,7 +31,7 @@
16 #include <assert.h>
17
18
19-const char* shellescapes = "|<>&!$\'\"#*?()[]{}";
20+const char* shellescapes = "|;<>&!$\'\"#*?()[]{}";
21
22 const char * temp_dir()
23 {
diff --git a/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb b/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
index 790c981..7d0d717 100644
--- a/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
+++ b/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb
@@ -17,6 +17,9 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca
17 17
18SRC_URI = "http://www.openprinting.org/download/foomatic/foomatic-filters-${PV}.tar.gz" 18SRC_URI = "http://www.openprinting.org/download/foomatic/foomatic-filters-${PV}.tar.gz"
19 19
20SRC_URI += "file://CVE-2015-8560.patch \
21 "
22
20SRC_URI[md5sum] = "b05f5dcbfe359f198eef3df5b283d896" 23SRC_URI[md5sum] = "b05f5dcbfe359f198eef3df5b283d896"
21SRC_URI[sha256sum] = "a2e2e53e502571e88eeb9010c45a0d54671f15707ee104f5c9c22b59ea7a33e3" 24SRC_URI[sha256sum] = "a2e2e53e502571e88eeb9010c45a0d54671f15707ee104f5c9c22b59ea7a33e3"
22 25