diff options
-rw-r--r-- | meta-webserver/recipes-php/modphp/files/php-CVE-2014-3587.patch | 31 | ||||
-rw-r--r-- | meta-webserver/recipes-php/modphp/modphp5.inc | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-webserver/recipes-php/modphp/files/php-CVE-2014-3587.patch b/meta-webserver/recipes-php/modphp/files/php-CVE-2014-3587.patch new file mode 100644 index 000000000..e1c40f244 --- /dev/null +++ b/meta-webserver/recipes-php/modphp/files/php-CVE-2014-3587.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | modphp: Security Advisory - php - CVE-2014-3587 | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | |||
5 | Signed-off-by: Yue Tao <yue.tao@windriver.com> | ||
6 | |||
7 | From 7ba1409a1aee5925180de546057ddd84ff267947 Mon Sep 17 00:00:00 2001 | ||
8 | From: Remi Collet <rcollet@redhat.com> | ||
9 | Date: Thu, 14 Aug 2014 17:19:03 -0700 | ||
10 | Subject: [PATCH] Fix bug #67716 - Segfault in cdf.c | ||
11 | |||
12 | --- | ||
13 | ext/fileinfo/libmagic/cdf.c | 2 +- | ||
14 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c | ||
17 | index 429f3b9..2c0a2d9 100644 | ||
18 | --- a/ext/fileinfo/libmagic/cdf.c | ||
19 | +++ b/ext/fileinfo/libmagic/cdf.c | ||
20 | @@ -820,7 +820,7 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, | ||
21 | q = (const uint8_t *)(const void *) | ||
22 | ((const char *)(const void *)p + ofs | ||
23 | - 2 * sizeof(uint32_t)); | ||
24 | - if (q > e) { | ||
25 | + if (q < p || q > e) { | ||
26 | DPRINTF(("Ran of the end %p > %p\n", q, e)); | ||
27 | goto out; | ||
28 | } | ||
29 | -- | ||
30 | 1.7.9.5 | ||
31 | |||
diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc index 6a2a61f5f..9c83ac044 100644 --- a/meta-webserver/recipes-php/modphp/modphp5.inc +++ b/meta-webserver/recipes-php/modphp/modphp5.inc | |||
@@ -10,6 +10,7 @@ SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \ | |||
10 | file://70_mod_php5.conf \ | 10 | file://70_mod_php5.conf \ |
11 | file://0001-using-pkgconfig-to-check-libxml.patch \ | 11 | file://0001-using-pkgconfig-to-check-libxml.patch \ |
12 | file://php-CVE-2014-5120.patch \ | 12 | file://php-CVE-2014-5120.patch \ |
13 | file://php-CVE-2014-3587.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | S = "${WORKDIR}/php-${PV}" | 16 | S = "${WORKDIR}/php-${PV}" |