From bcd5a90b9df12502fd17d167f697d2a3d4359f68 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Apr 2015 13:50:05 +0200 Subject: php-pecl-zendopcache: fix SCL build --- php-pecl-zendopcache-CVE-2015-1352.patch | 26 -------------------------- php-pecl-zendopcache.spec | 2 +- zendopcache-CVE-2015-1352.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 php-pecl-zendopcache-CVE-2015-1352.patch create mode 100644 zendopcache-CVE-2015-1352.patch diff --git a/php-pecl-zendopcache-CVE-2015-1352.patch b/php-pecl-zendopcache-CVE-2015-1352.patch deleted file mode 100644 index c6d8d28..0000000 --- a/php-pecl-zendopcache-CVE-2015-1352.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9a88100573c40b9f59baa2f2d138809eb47b4317 Mon Sep 17 00:00:00 2001 -From: Xinchen Hui -Date: Thu, 8 Jan 2015 16:32:20 +0800 -Subject: [PATCH] Fixed bug #68677 (Use After Free in OPcache) - -(cherry picked from commit 777c39f4042327eac4b63c7ee87dc1c7a09a3115) ---- - zend_shared_alloc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zend_shared_alloc.c b/zend_shared_alloc.c -index bbe26e8..8880b88 100644 ---- a/zend_shared_alloc.c -+++ b/zend_shared_alloc.c -@@ -346,10 +346,10 @@ void *_zend_shared_memdup(void *source, size_t size, zend_bool free_source TSRML - retval = ZCG(mem);; - ZCG(mem) = (void*)(((char*)ZCG(mem)) + ZEND_ALIGNED_SIZE(size)); - memcpy(retval, source, size); -+ zend_shared_alloc_register_xlat_entry(source, retval); - if (free_source) { - interned_efree((char*)source); - } -- zend_shared_alloc_register_xlat_entry(source, retval); - return retval; - } - diff --git a/php-pecl-zendopcache.spec b/php-pecl-zendopcache.spec index 4dfd9e1..c14705c 100644 --- a/php-pecl-zendopcache.spec +++ b/php-pecl-zendopcache.spec @@ -27,7 +27,7 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Source1: %{plug_name}.ini Source2: %{plug_name}-default.blacklist -Patch0: %{name}-CVE-2015-1352.patch +Patch0: %{pecl_name}-CVE-2015-1352.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: %{?scl_prefix}php-devel >= 5.2.0 diff --git a/zendopcache-CVE-2015-1352.patch b/zendopcache-CVE-2015-1352.patch new file mode 100644 index 0000000..c6d8d28 --- /dev/null +++ b/zendopcache-CVE-2015-1352.patch @@ -0,0 +1,26 @@ +From 9a88100573c40b9f59baa2f2d138809eb47b4317 Mon Sep 17 00:00:00 2001 +From: Xinchen Hui +Date: Thu, 8 Jan 2015 16:32:20 +0800 +Subject: [PATCH] Fixed bug #68677 (Use After Free in OPcache) + +(cherry picked from commit 777c39f4042327eac4b63c7ee87dc1c7a09a3115) +--- + zend_shared_alloc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zend_shared_alloc.c b/zend_shared_alloc.c +index bbe26e8..8880b88 100644 +--- a/zend_shared_alloc.c ++++ b/zend_shared_alloc.c +@@ -346,10 +346,10 @@ void *_zend_shared_memdup(void *source, size_t size, zend_bool free_source TSRML + retval = ZCG(mem);; + ZCG(mem) = (void*)(((char*)ZCG(mem)) + ZEND_ALIGNED_SIZE(size)); + memcpy(retval, source, size); ++ zend_shared_alloc_register_xlat_entry(source, retval); + if (free_source) { + interned_efree((char*)source); + } +- zend_shared_alloc_register_xlat_entry(source, retval); + return retval; + } + -- cgit