components/php-5_3/php-sapi/patches/250_php_20433646.patch
author Craig Mohrman <craig.mohrman@oracle.com>
Fri, 05 Jun 2015 15:10:12 -0700
changeset 4423 dd64204871b3
permissions -rw-r--r--
20293317 problem in UTILITY/PHP 20433646 problem in UTILITY/PHP
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4423
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     1
From php community:
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     2
BUG: https://bugs.php.net/bug.php?id=68710
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     3
CODE: https://github.com/php/php-src/commit/b585a3aed7880a5fa5c18e2b838fc96f40e075bd
dd64204871b3 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.
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     5
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     6
dd64204871b3 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
dd64204871b3 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
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     9
@@ -298,7 +298,7 @@
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    10
 		} else {
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    11
 			/* object properties should include no integers */
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    12
 			convert_to_string(key);
dd64204871b3 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) {
dd64204871b3 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) {
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    15
 				var_push_dtor(var_hash, old_data);
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    16
 			}
dd64204871b3 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,
dd64204871b3 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
dd64204871b3 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
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    20
@@ -304,7 +304,7 @@
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    21
 		} else {
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    22
 			/* object properties should include no integers */
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    23
 			convert_to_string(key);
dd64204871b3 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) {
dd64204871b3 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) {
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    26
 				var_push_dtor(var_hash, old_data);
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    27
 			}
dd64204871b3 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,
dd64204871b3 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
dd64204871b3 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
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    31
@@ -0,0 +1,25 @@
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    32
+--TEST--
dd64204871b3 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
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    34
+CVE-2014-8142 fix)
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    35
+--FILE--
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    36
+<?php
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    37
+for ($i=4; $i<100; $i++) {
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    38
+ $m = new StdClass();
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    39
+
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    40
+ $u = array(1);
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    41
+
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    42
+ $m->aaa = array(1,2,&$u,4,5);
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    43
+ $m->bbb = 1;
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    44
+ $m->ccc = &$u;
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    45
+ $m->ddd = str_repeat("A", $i);
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    46
+
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    47
+ $z = serialize($m);
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    48
+ $z = str_replace("aaa", "123", $z);
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    49
+ $z = str_replace("bbb", "123", $z);
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    50
+ $y = unserialize($z);
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    51
+ $z = serialize($y);
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    52
+}
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    53
+?>
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    54
+===DONE===
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    55
+--EXPECTF--
dd64204871b3 20293317 problem in UTILITY/PHP
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    56
+===DONE===