Skip to content

Commit 0d05928

arnaud-lb arnaud-lb

committed

Remote heap spraying / feng chui protection

Isolate request environment / input in separate chunks to makes it more difficult to remotely control the layout of the heap.

1 parent 38f7290 commit 0d05928Copy full SHA for 0d05928

File tree

17 files changed

+347

-161

lines changed

Zend
ext
- opcache
  - ZendAccelerator.c
- standard/tests/streams
  - bug78902.phpt
- zend_test/tests
  - observer_error_01.phpt
main
- main.c
tests/lang
- bug45392.phpt

17 files changed

+347

-161

lines changed

`‎Zend/tests/bug70258.phpt‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`--TEST--`
`2`	`2`	`Bug #70258 (Segfault if do_resize fails to allocated memory)`
`3`	`3`	`--INI--`
`4`		`-memory_limit=2M`
	`4`	`+memory_limit=4M`
`5`	`5`	`--SKIPIF--`
`6`	`6`	`<?php`
`7`	`7`	`$zend_mm_enabled = getenv("USE_ZEND_ALLOC");`
`@@ -25,4 +25,4 @@ $a = new A;`
`25`	`25`	`$a->core();`
`26`	`26`	`?>`
`27`	`27`	`--EXPECTF--`
`28`		`-Fatal error: Allowed memory size of 2097152 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d`
	`28`	`+Fatal error: Allowed memory size of 4194304 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d`

`‎Zend/tests/fibers/out-of-memory-in-fiber.phpt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`--TEST--`
`2`	`2`	`Out of Memory in a fiber`
`3`	`3`	`--INI--`
`4`		`-memory_limit=2M`
	`4`	`+memory_limit=4M`
`5`	`5`	`--SKIPIF--`
`6`	`6`	`<?php`
`7`	`7`	`if (getenv("USE_ZEND_ALLOC") === "0") {`

`‎Zend/tests/fibers/out-of-memory-in-nested-fiber.phpt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`--TEST--`
`2`	`2`	`Out of Memory in a nested fiber`
`3`	`3`	`--INI--`
`4`		`-memory_limit=2M`
	`4`	`+memory_limit=4M`
`5`	`5`	`--SKIPIF--`
`6`	`6`	`<?php`
`7`	`7`	`if (getenv("USE_ZEND_ALLOC") === "0") {`

`‎Zend/tests/fibers/out-of-memory-in-recursive-fiber.phpt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`--TEST--`
`2`	`2`	`Out of Memory from recursive fiber creation`
`3`	`3`	`--INI--`
`4`		`-memory_limit=2M`
	`4`	`+memory_limit=4M`
`5`	`5`	`--SKIPIF--`
`6`	`6`	`<?php`
`7`	`7`	`if (getenv("USE_ZEND_ALLOC") === "0") {`

`‎Zend/tests/gh11189.phpt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ GH-11189: Exceeding memory limit in zend_hash_do_resize leaves the array in an i`
`5`	`5`	`if (getenv("USE_ZEND_ALLOC") === "0") die("skip ZMM is disabled");`
`6`	`6`	`?>`
`7`	`7`	`--INI--`
`8`		`-memory_limit=2M`
	`8`	`+memory_limit=4M`
`9`	`9`	`--FILE--`
`10`	`10`	`<?php`
`11`	`11`

`‎Zend/tests/gh11189_1.phpt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ GH-11189: Exceeding memory limit in zend_hash_do_resize leaves the array in an i`
`5`	`5`	`if (getenv("USE_ZEND_ALLOC") === "0") die("skip ZMM is disabled");`
`6`	`6`	`?>`
`7`	`7`	`--INI--`
`8`		`-memory_limit=2M`
	`8`	`+memory_limit=4M`
`9`	`9`	`--FILE--`
`10`	`10`	`<?php`
`11`	`11`

`‎Zend/tests/gh12073.phpt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ function test() {`
`16`	`16`	`};`
`17`	`17`	`}`
`18`	`18`
`19`		`-ini_set('memory_limit', '2M');`
	`19`	`+ini_set('memory_limit', '4M');`
`20`	`20`
`21`	`21`	`$array = [];`
`22`	`22`	`for ($i = 0; $i < 10_000; $i++) {`

`‎Zend/tests/new_oom.inc‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-$mb_used = (int) ceil(memory_get_usage() / (1024 ** 2));`
	`3`	`+$mb_used = (int) ceil(memory_get_usage(true) / (1024 ** 2));`
`4`	`4`	`ini_set('memory_limit', ($mb_used + 1) . 'M');`
`5`	`5`
`6`	`6`	`$class = $argv[1];`

`‎Zend/tests/object_gc_in_shutdown.phpt‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`	`Bug object gc not working in shutdown`
`3`	`3`	`--FILE--`
`4`	`4`	`<?php`
`5`		`-ini_set('memory_limit', '2M');`
	`5`	`+ini_set('memory_limit', '4M');`
`6`	`6`	`register_shutdown_function(function () {`
`7`		`- for ($n = 1000 * 1000; $n--;) {`
	`7`	`+ for ($n = 2 * 1000 * 1000; $n--;) {`
`8`	`8`	`new stdClass;`
`9`	`9`	`}`
`10`	`10`	`echo "OK\n";`

0 commit comments

Comments

(0)