com php-src: Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize()): ext/standard/tests/strings/bug68710.phpt
ext/standard/var_unserializer.c ext/standard/var_unseri alizer.re

Commit: 6735df19b8a1c4095e2d6716fcd058582fa05930 Author: Stanislav Malyshev <stas@php.net> Thu, 1 Jan 2015 16:19:05 -0800 Committer: Julien Pauli <jpauli@php.net> Wed, 21 Jan 2015 10:14:05 +0100 Parents: c8bef5762737e6c3f3fcf6952f343204cd2350fb Branches: PHP-5.5.21 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6735df19b8a1c4095e2d6716fcd058582fa05930 Log: Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize()) Conflicts: ext/standard/var_unserializer.c Bugs: https://bugs.php.net/68710 Changed paths: A ext/standard/tests/strings/bug68710.phpt M ext/standard/var_unserializer.c M ext/standard/var_unserializer.re Diff: diff --git a/ext/standard/tests/strings/bug68710.phpt b/ext/standard/tests/strings/bug68710.phpt new file mode 100644 index 0000000..729a120 --- /dev/null +++ b/ext/standard/tests/strings/bug68710.phpt @@ -0,0 +1,25 @@ +--TEST-- +Bug #68710 Use after free vulnerability in unserialize() (bypassing the +CVE-2014-8142 fix) +--FILE-- +<?php +for ($i=4; $i<100; $i++) { + $m = new StdClass(); + + $u = array(1); + + $m->aaa = array(1,2,&$u,4,5); + $m->bbb = 1; + $m->ccc = &$u; + $m->ddd = str_repeat("A", $i); + + $z = serialize($m); + $z = str_replace("aaa", "123", $z); + $z = str_replace("bbb", "123", $z); + $y = unserialize($z); + $z = serialize($y); +} +?> +===DONE=== +--EXPECTF-- +===DONE=== diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index a12d2fa..9395959 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -343,7 +343,7 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long } else { /* object properties should include no integers */ convert_to_string(key); - if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { var_push_dtor(var_hash, old_data); } zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 4cf1d10..f04fc74 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -347,7 +347,7 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long } else { /* object properties should include no integers */ convert_to_string(key); - if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { var_push_dtor(var_hash, old_data); } zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,