com php-src: Fixed use-after-free during preloading, when q class with unresolved constant uses a preloaded trait.: ext/opcache/ZendAccelerator.c
ext/opcache/tests/preload_009.phpt ext/opcache/test s/preload_undef_const_2.inc

From: Date: Mon, 18 Feb 2019 10:46:13 +0000
Subject: com php-src: Fixed use-after-free during preloading, when q class with unresolved constant uses a preloaded trait.: ext/opcache/ZendAccelerator.c
ext/opcache/tests/preload_009.phpt ext/opcache/test s/preload_undef_const_2.inc
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-104685@lists.php.net to get a copy of this message
Commit: 3ef9f23fce327ab3d157c9d63c245f8a743e956d Author: Dmitry Stogov <dmitry@zend.com> Mon, 18 Feb 2019 13:46:13 +0300 Parents: 05363890a0e4246f24fe7ad4f47cf7d2b2a90bbd Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3ef9f23fce327ab3d157c9d63c245f8a743e956d Log: Fixed use-after-free during preloading, when q class with unresolved constant uses a preloaded trait. Changed paths: M ext/opcache/ZendAccelerator.c A ext/opcache/tests/preload_009.phpt A ext/opcache/tests/preload_undef_const_2.inc Diff: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index dc83002..3359e37 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -3621,6 +3621,28 @@ static void preload_remove_empty_includes(void) } ZEND_HASH_FOREACH_END(); } +static void preload_fix_trait_methods(zend_class_entry *ce) +{ + zend_op_array *op_array; + + ZEND_HASH_FOREACH_PTR(&ce->function_table, op_array) { + if (op_array->fn_flags & ZEND_ACC_TRAIT_CLONE) { + zend_op_array *orig_op_array = zend_shared_alloc_get_xlat_entry(op_array->opcodes); + if (orig_op_array) { + zend_class_entry *scope = op_array->scope; + uint32_t fn_flags = op_array->fn_flags; + zend_function *prototype = op_array->prototype; + HashTable *ht = op_array->static_variables; + *op_array = *orig_op_array; + op_array->scope = scope; + op_array->fn_flags = fn_flags; + op_array->prototype = prototype; + op_array->static_variables = ht; + } + } + } ZEND_HASH_FOREACH_END(); +} + static int preload_optimize(zend_persistent_script *script) { zend_class_entry *ce; @@ -3644,25 +3666,18 @@ static int preload_optimize(zend_persistent_script *script) ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) { if (ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS) { - ZEND_HASH_FOREACH_PTR(&ce->function_table, op_array) { - if (op_array->fn_flags & ZEND_ACC_TRAIT_CLONE) { - zend_op_array *orig_op_array = zend_shared_alloc_get_xlat_entry(op_array->opcodes); - if (orig_op_array) { - zend_class_entry *scope = op_array->scope; - uint32_t fn_flags = op_array->fn_flags; - zend_function *prototype = op_array->prototype; - HashTable *ht = op_array->static_variables; - *op_array = *orig_op_array; - op_array->scope = scope; - op_array->fn_flags = fn_flags; - op_array->prototype = prototype; - op_array->static_variables = ht; - } - } - } ZEND_HASH_FOREACH_END(); + preload_fix_trait_methods(ce); } } ZEND_HASH_FOREACH_END(); + ZEND_HASH_FOREACH_PTR(preload_scripts, script) { + ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) { + if (ce->ce_flags & ZEND_ACC_IMPLEMENT_TRAITS) { + preload_fix_trait_methods(ce); + } + } ZEND_HASH_FOREACH_END(); + } ZEND_HASH_FOREACH_END(); + zend_shared_alloc_destroy_xlat_table(); ZEND_HASH_FOREACH_PTR(preload_scripts, script) { @@ -3846,6 +3861,8 @@ static int accel_preload(const char *config) zend_string *filename; int ping_auto_globals_mask; int i; + zend_class_entry *ce; + zend_op_array *op_array; if (PG(auto_globals_jit)) { ping_auto_globals_mask = zend_accel_get_auto_globals(); @@ -3925,6 +3942,19 @@ static int accel_preload(const char *config) HANDLE_BLOCK_INTERRUPTIONS(); SHM_UNPROTECT(); + /* Store method names first, because they may be shared between preloaded and non-preloaded classes */ + ZEND_HASH_FOREACH_PTR(&script->script.class_table, ce) { + ZEND_HASH_FOREACH_PTR(&ce->function_table, op_array) { + zend_string *new_name = zend_shared_alloc_get_xlat_entry(op_array->function_name); + + if (!new_name) { + new_name = accel_new_interned_string(op_array->function_name); + zend_shared_alloc_register_xlat_entry(op_array->function_name, new_name); + } + op_array->function_name = new_name; + } ZEND_HASH_FOREACH_END(); + } ZEND_HASH_FOREACH_END(); + ZCSG(preload_script) = preload_script_in_shared_memory(script); SHM_PROTECT(); diff --git a/ext/opcache/tests/preload_009.phpt b/ext/opcache/tests/preload_009..phpt new file mode 100644 index 0000000..563e010 --- /dev/null +++ b/ext/opcache/tests/preload_009.phpt @@ -0,0 +1,18 @@ +--TEST-- +Preloading class using trait with undefined class constant access +--INI-- +opcache.enable=1 +opcache.enable_cli=1 +opcache.optimization_level=-1 +opcache.preload={PWD}/preload_undef_const_2.inc +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php +var_dump(trait_exists('T')); +var_dump(class_exists('Foo')); +?> +--EXPECTF-- +Warning: Can't preload class Foo with unresolved constants at %s:%d in Unknown on line 0 +bool(true) +bool(false) diff --git a/ext/opcache/tests/preload_undef_const_2.inc b/ext/opcache/tests/preload_undef_const_2.inc new file mode 100644 index 0000000..8c1c19c --- /dev/null +++ b/ext/opcache/tests/preload_undef_const_2.inc @@ -0,0 +1,11 @@ +<?php +trait T { + public function test() { + return 123; + } +} + +class Foo { + const C = UNDEF; + use T; +}

« previous php.cvs (#104685) next »