com php-src: More fixes for bug #70219: ext/session/session.c ext/standard/tests/serialize/bug70219_1.phpt
| From: | Stanislav Malyshev | Date: | Sat, 29 Aug 2015 04:50:21 +0000 |
| Subject: | com php-src: More fixes for bug #70219: ext/session/session.c ext/standard/tests/serialize/bug70219_1.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88834@lists.php.net to get a copy of this message | ||
Commit: fc8eff897bd7fe3fed7f6867d2d6a86117a5278d
Author: Stanislav Malyshev <stas@php.net> Fri, 28 Aug 2015 21:50:21 -0700
Parents: 24dda816d069a2e0cb5dc2985afd7f3269202946
Branches: PHP-5.5.29
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fc8eff897bd7fe3fed7f6867d2d6a86117a5278d
Log:
More fixes for bug #70219
Bugs:
https://bugs.php.net/70219
Changed paths:
M ext/session/session.c
A ext/standard/tests/serialize/bug70219_1.phpt
Diff:
diff --git a/ext/session/session.c b/ext/session/session.c
index 247f9b2...f5439ea 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -863,7 +863,10 @@ PS_SERIALIZER_DECODE_FUNC(php_serialize) /* {{{ */
PHP_VAR_UNSERIALIZE_INIT(var_hash);
ALLOC_INIT_ZVAL(session_vars);
- php_var_unserialize(&session_vars, &val, endptr, &var_hash TSRMLS_CC);
+ if (php_var_unserialize(&session_vars, &val, endptr, &var_hash TSRMLS_CC)) {
+ var_push_dtor(&var_hash, &session_vars);
+ }
+
PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
if (PS(http_session_vars)) {
zval_ptr_dtor(&PS(http_session_vars));
@@ -872,7 +875,7 @@ PS_SERIALIZER_DECODE_FUNC(php_serialize) /* {{{ */
array_init(session_vars);
}
PS(http_session_vars) = session_vars;
- ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"),
PS(http_session_vars), 2, 1);
+ ZEND_SET_GLOBAL_VAR_WITH_LENGTH("_SESSION", sizeof("_SESSION"),
PS(http_session_vars), Z_REFCOUNT_P(PS(http_session_vars)) + 1, 1);
return SUCCESS;
}
/* }}} */
diff --git a/ext/standard/tests/serialize/bug70219_1.phpt
b/ext/standard/tests/serialize/bug70219_1.phpt
new file mode 100644
index 0000000..f9c4c67
--- /dev/null
+++ b/ext/standard/tests/serialize/bug70219_1.phpt
@@ -0,0 +1,46 @@
+--TEST--
+Bug #70219 Use after free vulnerability in session deserializer
+--FILE--
+<?php
+ini_set('session.serialize_handler', 'php_serialize');
+session_start();
+
+class obj implements Serializable {
+ var $data;
+ function serialize() {
+ return serialize($this->data);
+ }
+ function unserialize($data) {
+ session_decode($data);
+ }
+}
+
+$inner = 'r:2;';
+$exploit =
'a:2:{i:0;C:3:"obj":'.strlen($inner).':{'.$inner.'}i:1;C:3:"obj":'.strlen($inner).':{'.$inner.'}}';
+
+$data = unserialize($exploit);
+
+for ($i = 0; $i < 5; $i++) {
+ $v[$i] = 'hi'.$i;
+}
+
+var_dump($data);
+var_dump($_SESSION);
+?>
+--EXPECTF--
+array(2) {
+ [0]=>
+ &object(obj)#%d (1) {
+ ["data"]=>
+ NULL
+ }
+ [1]=>
+ object(obj)#%d (1) {
+ ["data"]=>
+ NULL
+ }
+}
+object(obj)#1 (1) {
+ ["data"]=>
+ NULL
+}
\ No newline at end of file