com php-src: Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization): NEWS ext/wddx/tests/bug70661.phpt ext/wddx/wddx.c

From: Date: Mon, 28 Dec 2015 22:46:35 +0000
Subject: com php-src: Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization): NEWS ext/wddx/tests/bug70661.phpt ext/wddx/wddx.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90524@lists.php.net to get a copy of this message
Commit: dcf3c9761c31e12011ba202f30caff53aae2056c Author: Stanislav Malyshev <stas@php.net> Mon, 28 Dec 2015 14:46:35 -0800 Parents: 1785d2b805f64eaaacf98c14c9e13107bf085ab1 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=dcf3c9761c31e12011ba202f30caff53aae2056c Log: Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization) Bugs: https://bugs.php.net/70661 Changed paths: M NEWS A ext/wddx/tests/bug70661.phpt M ext/wddx/wddx.c Diff: diff --git a/NEWS b/NEWS index 67fbcae..f49c76a 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,8 @@ PHP NEWS Out of Bounds). (emmanuel dot law at gmail dot com). - WDDX: + . Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization). + (taoguangchen at icloud dot com) . Fixed bug #70741 (Session WDDX Packet Deserialization Type Confusion Vulnerability). (taoguangchen at icloud dot com) diff --git a/ext/wddx/tests/bug70661.phpt b/ext/wddx/tests/bug70661.phpt new file mode 100644 index 0000000...e068c20 --- /dev/null +++ b/ext/wddx/tests/bug70661.phpt @@ -0,0 +1,69 @@ +--TEST-- +Bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization) +--SKIPIF-- +<?php +if (!extension_loaded("wddx")) print "skip"; +?> +--FILE-- +<?php +$fakezval = ptr2str(1122334455); +$fakezval .= ptr2str(0); +$fakezval .= "\x00\x00\x00\x00"; +$fakezval .= "\x01"; +$fakezval .= "\x00"; +$fakezval .= "\x00\x00"; + +$x = <<<EOT +<?xml version='1.0'?> +<wddxPacket version='1.0'> +<header/> + <data> + <struct> + <recordset rowCount='1' fieldNames='ryat'> + <field name='ryat'> + <var name='php_class_name'> + <string>stdClass</string> + </var> + <null/> + </field> + </recordset> + </struct> + </data> +</wddxPacket> +EOT; + +$y = wddx_deserialize($x); + +for ($i = 0; $i < 5; $i++) { + $v[$i] = $fakezval.$i; +} + +var_dump($y); + +function ptr2str($ptr) +{ + $out = ''; + + for ($i = 0; $i < 8; $i++) { + $out .= chr($ptr & 0xff); + $ptr >>= 8; + } + + return $out; +} +?> +DONE +--EXPECTF-- +array(1) { + [0]=> + array(1) { + ["ryat"]=> + array(2) { + ["php_class_name"]=> + string(8) "stdClass" + [0]=> + NULL + } + } +} +DONE \ No newline at end of file diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 8017620..b9dd1fa 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -978,7 +978,7 @@ static void php_wddx_pop_element(void *user_data, const XML_Char *name) if (ent1->varname) { if (!strcmp(ent1->varname, PHP_CLASS_NAME_VAR) && - Z_TYPE_P(ent1->data) == IS_STRING && Z_STRLEN_P(ent1->data)) { + Z_TYPE_P(ent1->data) == IS_STRING && Z_STRLEN_P(ent1->data) && ent2->type == ST_STRUCT) { zend_bool incomplete_class = 0; zend_str_tolower(Z_STRVAL_P(ent1->data), Z_STRLEN_P(ent1->data));

« previous php.cvs (#90524) next »