[php/f18] - update to 5.4.23, fix for CVE-2013-6420 - fix zend_register_functions breaks reflection, php bug 6
Remi Collet
remi at fedoraproject.org
Wed Dec 11 05:48:47 UTC 2013
commit 0d4aa9c55ef437b15a87349a8ace126d59e5703f
Author: Remi Collet <remi at fedoraproject.org>
Date: Wed Dec 11 06:48:42 2013 +0100
- update to 5.4.23, fix for CVE-2013-6420
- fix zend_register_functions breaks reflection, php bug 66218
.gitignore | 1 +
php-bug66218.patch | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++
php.spec | 11 ++-
sources | 2 +-
4 files changed, 264 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a6b6c5e..a691894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ php-5.5*.xz
/php-5.4.20.tar.bz2
/php-5.4.21.tar.bz2
/php-5.4.22.tar.bz2
+/php-5.4.23.tar.bz2
diff --git a/php-bug66218.patch b/php-bug66218.patch
new file mode 100644
index 0000000..6c2d17b
--- /dev/null
+++ b/php-bug66218.patch
@@ -0,0 +1,252 @@
+From 3e963f8eb44863ef3d758eabe791190b0fd7bb9a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi at php.net>
+Date: Tue, 10 Dec 2013 16:07:16 +0100
+Subject: [PATCH] Fixed Bug #66218 zend_register_functions breaks reflection
+
+Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection.
+
+Ex: additional_functions from api_module_entry.
+Ex: in CLI, dl, cli_set_process_title and cli_get_process_title
+
+Note:
+- also affects functions overrided in extension
+ (should be be reported in extension, where overrided, not in original extension)
+- also allow extension to call zend_register_functions for various list
+ (instead of having a single bug list)
+---
+ NEWS | 1 +
+ Zend/tests/bug66218.phpt | 21 +++++++
+ Zend/zend_builtin_functions.c | 51 ++++++++++-------
+ ext/reflection/php_reflection.c | 66 +++++++++-------------
+ .../tests/ReflectionExtension_bug66218.phpt | 21 +++++++
+ 5 files changed, 101 insertions(+), 59 deletions(-)
+ create mode 100644 Zend/tests/bug66218.phpt
+ create mode 100644 ext/reflection/tests/ReflectionExtension_bug66218.phpt
+
+diff --git a/Zend/tests/bug66218.phpt b/Zend/tests/bug66218.phpt
+new file mode 100644
+index 0000000..af7a5ab
+--- /dev/null
++++ b/Zend/tests/bug66218.phpt
+@@ -0,0 +1,21 @@
++--TEST--
++Bug #66218 zend_register_functions breaks reflection
++--SKIPIF--
++<?php
++if (PHP_SAPI != "cli") die("skip CLI only test");
++if (!function_exists("dl")) die("skip need dl");
++?>
++--FILE--
++<?php
++$tab = get_extension_funcs("standard");
++$fcts = array("dl");
++foreach ($fcts as $fct) {
++ if (in_array($fct, $tab)) {
++ echo "$fct Ok\n";
++ }
++}
++?>
++Done
++--EXPECTF--
++dl Ok
++Done
+diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
+index 04f4ebe..12a8fb2 100644
+--- a/Zend/zend_builtin_functions.c
++++ b/Zend/zend_builtin_functions.c
+@@ -2452,36 +2452,49 @@ ZEND_FUNCTION(extension_loaded)
+ Returns an array with the names of functions belonging to the named extension */
+ ZEND_FUNCTION(get_extension_funcs)
+ {
+- char *extension_name;
+- int extension_name_len;
++ char *extension_name, *lcname;
++ int extension_name_len, array;
+ zend_module_entry *module;
+- const zend_function_entry *func;
+-
++ HashPosition iterator;
++ zend_function *zif;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &extension_name, &extension_name_len) == FAILURE) {
+ return;
+ }
+-
+ if (strncasecmp(extension_name, "zend", sizeof("zend"))) {
+- char *lcname = zend_str_tolower_dup(extension_name, extension_name_len);
+- if (zend_hash_find(&module_registry, lcname,
+- extension_name_len+1, (void**)&module) == FAILURE) {
+- efree(lcname);
+- RETURN_FALSE;
+- }
++ lcname = zend_str_tolower_dup(extension_name, extension_name_len);
++ } else {
++ lcname = estrdup("core");
++ }
++ if (zend_hash_find(&module_registry, lcname,
++ extension_name_len+1, (void**)&module) == FAILURE) {
+ efree(lcname);
++ RETURN_FALSE;
++ }
+
+- if (!(func = module->functions)) {
+- RETURN_FALSE;
+- }
++ zend_hash_internal_pointer_reset_ex(CG(function_table), &iterator);
++ if (module->functions) {
++ /* avoid BC break, if functions list is empty, will return an empty array */
++ array_init(return_value);
++ array = 1;
+ } else {
+- func = builtin_functions;
++ array = 0;
++ }
++ while (zend_hash_get_current_data_ex(CG(function_table), (void **) &zif, &iterator) == SUCCESS) {
++ if (zif->common.type==ZEND_INTERNAL_FUNCTION
++ && zif->internal_function.module == module) {
++ if (!array) {
++ array_init(return_value);
++ array = 1;
++ }
++ add_next_index_string(return_value, zif->common.function_name, 1);
++ }
++ zend_hash_move_forward_ex(CG(function_table), &iterator);
+ }
+
+- array_init(return_value);
++ efree(lcname);
+
+- while (func->fname) {
+- add_next_index_string(return_value, func->fname, 1);
+- func++;
++ if (!array) {
++ RETURN_FALSE;
+ }
+ }
+ /* }}} */
+diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
+index c4a7c55..803b12b 100644
+--- a/ext/reflection/php_reflection.c
++++ b/ext/reflection/php_reflection.c
+@@ -1105,29 +1105,26 @@ static void _extension_string(string *str, zend_module_entry *module, char *inde
+ string_free(&str_constants);
+ }
+
+- if (module->functions && module->functions->fname) {
++ {
++ HashPosition iterator;
+ zend_function *fptr;
+- const zend_function_entry *func = module->functions;
+-
+- string_printf(str, "\n - Functions {\n");
+-
+- /* Is there a better way of doing this? */
+- while (func->fname) {
+- int fname_len = strlen(func->fname);
+- char *lc_name = zend_str_tolower_dup(func->fname, fname_len);
+-
+- if (zend_hash_find(EG(function_table), lc_name, fname_len + 1, (void**) &fptr) == FAILURE) {
+- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Internal error: Cannot find extension function %s in global function table", func->fname);
+- func++;
+- efree(lc_name);
+- continue;
++ int first = 1;
++
++ zend_hash_internal_pointer_reset_ex(CG(function_table), &iterator);
++ while (zend_hash_get_current_data_ex(CG(function_table), (void **) &fptr, &iterator) == SUCCESS) {
++ if (fptr->common.type==ZEND_INTERNAL_FUNCTION
++ && fptr->internal_function.module == module) {
++ if (first) {
++ string_printf(str, "\n - Functions {\n");
++ first = 0;
++ }
++ _function_string(str, fptr, NULL, " " TSRMLS_CC);
+ }
+-
+- _function_string(str, fptr, NULL, " " TSRMLS_CC);
+- efree(lc_name);
+- func++;
++ zend_hash_move_forward_ex(CG(function_table), &iterator);
++ }
++ if (!first) {
++ string_printf(str, "%s }\n", indent);
+ }
+- string_printf(str, "%s }\n", indent);
+ }
+
+ {
+@@ -5242,6 +5239,9 @@ ZEND_METHOD(reflection_extension, getFunctions)
+ {
+ reflection_object *intern;
+ zend_module_entry *module;
++ HashPosition iterator;
++ zval *function;
++ zend_function *fptr;
+
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+@@ -5249,29 +5249,15 @@ ZEND_METHOD(reflection_extension, getFunctions)
+ GET_REFLECTION_OBJECT_PTR(module);
+
+ array_init(return_value);
+- if (module->functions) {
+- zval *function;
+- zend_function *fptr;
+- const zend_function_entry *func = module->functions;
+-
+- /* Is there a better way of doing this? */
+- while (func->fname) {
+- int fname_len = strlen(func->fname);
+- char *lc_name = zend_str_tolower_dup(func->fname, fname_len);
+-
+- if (zend_hash_find(EG(function_table), lc_name, fname_len + 1, (void**) &fptr) == FAILURE) {
+- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Internal error: Cannot find extension function %s in global function table", func->fname);
+- func++;
+- efree(lc_name);
+- continue;
+- }
+-
++ zend_hash_internal_pointer_reset_ex(CG(function_table), &iterator);
++ while (zend_hash_get_current_data_ex(CG(function_table), (void **) &fptr, &iterator) == SUCCESS) {
++ if (fptr->common.type==ZEND_INTERNAL_FUNCTION
++ && fptr->internal_function.module == module) {
+ ALLOC_ZVAL(function);
+ reflection_function_factory(fptr, NULL, function TSRMLS_CC);
+- add_assoc_zval_ex(return_value, func->fname, fname_len+1, function);
+- func++;
+- efree(lc_name);
++ add_assoc_zval(return_value, fptr->common.function_name, function);
+ }
++ zend_hash_move_forward_ex(CG(function_table), &iterator);
+ }
+ }
+ /* }}} */
+diff --git a/ext/reflection/tests/ReflectionExtension_bug66218.phpt b/ext/reflection/tests/ReflectionExtension_bug66218.phpt
+new file mode 100644
+index 0000000..e263624
+--- /dev/null
++++ b/ext/reflection/tests/ReflectionExtension_bug66218.phpt
+@@ -0,0 +1,21 @@
++--TEST--
++ReflectionExtension::getFunctions() ##6218 zend_register_functions breaks reflection
++--SKIPIF--
++<?php
++if (!extension_loaded('reflection')) print 'skip missing reflection extension';
++if (PHP_SAPI != "cli") die("skip CLI only test");
++if (!function_exists("dl")) die("skip need dl");
++?>
++--FILE--
++<?php
++$r = new ReflectionExtension('standard');
++$t = $r->getFunctions();
++var_dump($t['dl']);
++?>
++Done
++--EXPECTF--
++object(ReflectionFunction)#%d (1) {
++ ["name"]=>
++ string(2) "dl"
++}
++Done
+--
+1.8.4.3
+
diff --git a/php.spec b/php.spec
index 9962df1..4d94b67 100644
--- a/php.spec
+++ b/php.spec
@@ -60,7 +60,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.4.22
+Version: 5.4.23
Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -105,6 +105,9 @@ Patch46: php-5.4.9-fixheader.patch
# drop "Configure command" from phpinfo output
Patch47: php-5.4.9-phpinfo.patch
+# Upstream fixes
+Patch100: php-bug66218.patch
+
# Security fixes
# Fixes for tests
@@ -683,6 +686,8 @@ support for using the enchant library to PHP.
%patch46 -p1 -b .fixheader
%patch47 -p1 -b .phpinfo
+%patch100 -p1 -b .bug66218
+
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
cp TSRM/LICENSE TSRM_LICENSE
@@ -1415,6 +1420,10 @@ fi
%changelog
+* Wed Dec 11 2013 Remi Collet <rcollet at redhat.com> 5.4.23-1
+- update to 5.4.23, fix for CVE-2013-6420
+- fix zend_register_functions breaks reflection, php bug 66218
+
* Wed Nov 13 2013 Remi Collet <remi at fedoraproject.org> 5.4.22-1
- update to 5.4.22
diff --git a/sources b/sources
index 75bc29c..bf28f76 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a7400d1d7f1f55b2b36285bf1a00762 php-5.4.22.tar.bz2
+023857598b92ea5c78137543817f4bc5 php-5.4.23.tar.bz2
More information about the scm-commits
mailing list