author | Craig Mohrman <craig.mohrman@oracle.com> |
Fri, 12 Jun 2015 09:25:50 -0700 | |
branch | s11u2-sru |
changeset 4475 | ae2aef15d437 |
permissions | -rw-r--r-- |
4475
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
1 |
From php community: |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
2 |
BUG: https://bugs.php.net/bug.php?id=68710 |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
3 |
CODE: https://github.com/php/php-src/commit/b585a3aed7880a5fa5c18e2b838fc96f40e075bd |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
4 |
Created for php 5.3 based on code from the community bug. |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
5 |
|
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
6 |
|
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
7 |
--- php-5.3.29/ext/standard/var_unserializer.c_orig 2015-06-03 16:10:58.649025322 -0700 |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
8 |
+++ php-5.3.29/ext/standard/var_unserializer.c 2015-06-03 16:11:38.093987868 -0700 |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
9 |
@@ -298,7 +298,7 @@ |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
10 |
} else { |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
11 |
/* object properties should include no integers */ |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
12 |
convert_to_string(key); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
13 |
- if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
14 |
+ if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
15 |
var_push_dtor(var_hash, old_data); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
16 |
} |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
17 |
zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
18 |
--- php-5.3.29/ext/standard/var_unserializer.re_orig 2015-06-03 16:09:21.637872795 -0700 |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
19 |
+++ php-5.3.29/ext/standard/var_unserializer.re 2015-06-03 16:10:05.641543642 -0700 |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
20 |
@@ -304,7 +304,7 @@ |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
21 |
} else { |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
22 |
/* object properties should include no integers */ |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
23 |
convert_to_string(key); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
24 |
- if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
25 |
+ if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
26 |
var_push_dtor(var_hash, old_data); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
27 |
} |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
28 |
zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
29 |
--- php-5.3.29/ext/standard/tests/strings/bug68710.phpt_orig 2015-06-03 16:16:50.728789966 -0700 |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
30 |
+++ php-5.3.29/ext/standard/tests/strings/bug68710.phpt 2015-06-03 16:12:43.728868416 -0700 |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
31 |
@@ -0,0 +1,25 @@ |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
32 |
+--TEST-- |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
33 |
+Bug #68710 Use after free vulnerability in unserialize() (bypassing the |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
34 |
+CVE-2014-8142 fix) |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
35 |
+--FILE-- |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
36 |
+<?php |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
37 |
+for ($i=4; $i<100; $i++) { |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
38 |
+ $m = new StdClass(); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
39 |
+ |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
40 |
+ $u = array(1); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
41 |
+ |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
42 |
+ $m->aaa = array(1,2,&$u,4,5); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
43 |
+ $m->bbb = 1; |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
44 |
+ $m->ccc = &$u; |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
45 |
+ $m->ddd = str_repeat("A", $i); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
46 |
+ |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
47 |
+ $z = serialize($m); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
48 |
+ $z = str_replace("aaa", "123", $z); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
49 |
+ $z = str_replace("bbb", "123", $z); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
50 |
+ $y = unserialize($z); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
51 |
+ $z = serialize($y); |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
52 |
+} |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
53 |
+?> |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
54 |
+===DONE=== |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
55 |
+--EXPECTF-- |
ae2aef15d437
20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
56 |
+===DONE=== |