|
 |
20017b |
From 646572d6d3847d68124b03936719f60936b49a38 Mon Sep 17 00:00:00 2001
|
|
|
20017b |
From: Stanislav Malyshev <stas@php.net>
|
|
|
20017b |
Date: Tue, 17 Mar 2015 13:20:22 -0700
|
|
|
20017b |
Subject: [PATCH] Fixed bug #68976 - Use After Free Vulnerability in
|
|
|
20017b |
unserialize()
|
|
|
20017b |
|
|
|
20017b |
---
|
|
|
20017b |
NEWS | 3 +-
|
|
|
20017b |
ext/standard/var_unserializer.c | 63 ++++++++++++++++++++--------------------
|
|
|
20017b |
ext/standard/var_unserializer.re | 1 +
|
|
|
20017b |
3 files changed, 35 insertions(+), 32 deletions(-)
|
|
|
20017b |
|
|
|
20017b |
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
|
|
|
20017b |
index f114080..ee0cac4 100644
|
|
|
20017b |
--- a/ext/standard/var_unserializer.c
|
|
|
20017b |
+++ b/ext/standard/var_unserializer.c
|
|
|
20017b |
@@ -315,6 +315,7 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long
|
|
|
20017b |
zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
|
|
|
20017b |
sizeof data, NULL);
|
|
|
20017b |
}
|
|
|
20017b |
+ var_push_dtor(var_hash, &data);
|
|
|
20017b |
|
|
|
20017b |
zval_dtor(key);
|
|
|
20017b |
FREE_ZVAL(key);
|
|
|
20017b |
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
|
|
|
20017b |
index f04fc74..abac77c 100644
|
|
|
20017b |
--- a/ext/standard/var_unserializer.re
|
|
|
20017b |
+++ b/ext/standard/var_unserializer.re
|
|
|
20017b |
@@ -321,6 +321,7 @@ static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long
|
|
|
20017b |
zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data,
|
|
|
20017b |
sizeof data, NULL);
|
|
|
20017b |
}
|
|
|
20017b |
+ var_push_dtor(var_hash, &data);
|
|
|
20017b |
|
|
|
20017b |
zval_dtor(key);
|
|
|
20017b |
FREE_ZVAL(key);
|
|
|
20017b |
--
|
|
|
20017b |
2.1.4
|
|
|
20017b |
|
|
|
20017b |
From 8b14d3052ffcffa17d6e2be652f20e18f8f562ad Mon Sep 17 00:00:00 2001
|
|
|
20017b |
From: Stanislav Malyshev <stas@php.net>
|
|
|
20017b |
Date: Tue, 17 Mar 2015 17:03:46 -0700
|
|
|
20017b |
Subject: [PATCH] add test for bug #68976
|
|
|
20017b |
|
|
|
20017b |
---
|
|
|
20017b |
ext/standard/tests/serialize/bug68976.phpt | 37 ++++++++++++++++++++++++++++++
|
|
|
20017b |
1 file changed, 37 insertions(+)
|
|
|
20017b |
create mode 100644 ext/standard/tests/serialize/bug68976.phpt
|
|
|
20017b |
|
|
|
20017b |
diff --git a/ext/standard/tests/serialize/bug68976.phpt b/ext/standard/tests/serialize/bug68976.phpt
|
|
|
20017b |
new file mode 100644
|
|
|
20017b |
index 0000000..a79a953
|
|
|
20017b |
--- /dev/null
|
|
|
20017b |
+++ b/ext/standard/tests/serialize/bug68976.phpt
|
|
|
20017b |
@@ -0,0 +1,37 @@
|
|
|
20017b |
+--TEST--
|
|
|
20017b |
+Bug #68976 Use After Free Vulnerability in unserialize()
|
|
|
20017b |
+--FILE--
|
|
|
20017b |
+
|
|
|
20017b |
+class evilClass {
|
|
|
20017b |
+ public $name;
|
|
|
20017b |
+ function __wakeup() {
|
|
|
20017b |
+ unset($this->name);
|
|
|
20017b |
+ }
|
|
|
20017b |
+}
|
|
|
20017b |
+
|
|
|
20017b |
+$fakezval = pack(
|
|
|
20017b |
+ 'IIII',
|
|
|
20017b |
+ 0x00100000,
|
|
|
20017b |
+ 0x00000400,
|
|
|
20017b |
+ 0x00000000,
|
|
|
20017b |
+ 0x00000006
|
|
|
20017b |
+);
|
|
|
20017b |
+
|
|
|
20017b |
+$data = unserialize('a:2:{i:0;O:9:"evilClass":1:{s:4:"name";a:2:{i:0;i:1;i:1;i:2;}}i:1;R:4;}');
|
|
|
20017b |
+
|
|
|
20017b |
+for($i = 0; $i < 5; $i++) {
|
|
|
20017b |
+ $v[$i] = $fakezval.$i;
|
|
|
20017b |
+}
|
|
|
20017b |
+
|
|
|
20017b |
+var_dump($data);
|
|
|
20017b |
+?>
|
|
|
20017b |
+===DONE===
|
|
|
20017b |
+--EXPECTF--
|
|
|
20017b |
+array(2) {
|
|
|
20017b |
+ [0]=>
|
|
|
20017b |
+ object(evilClass)#1 (0) {
|
|
|
20017b |
+ }
|
|
|
20017b |
+ [1]=>
|
|
|
20017b |
+ int(1)
|
|
|
20017b |
+}
|
|
|
20017b |
+===DONE===
|
|
|
20017b |
--
|
|
|
20017b |
2.1.4
|
|
|
20017b |
|