Commit 5e7fb2c

committed

Allow to opt-out of userinput isolation

1 parent e931ad3 commit 5e7fb2cCopy full SHA for 5e7fb2c

File tree

1 file changed

+25

-11

lines changed

Zend
- zend_alloc.c

1 file changed

+25

-11

lines changed

`‎Zend/zend_alloc.c‎`

Lines changed: 25 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -2770,7 +2770,8 @@ ZEND_API size_t ZEND_FASTCALL _zend_mm_block_size(zend_mm_heap heap, void ptr`
`2770`	`2770`
`2771`	`2771`	`typedef struct _zend_alloc_globals {`
`2772`	`2772`	`zend_mm_heap *mm_heap;`
`2773`		`- uint32_t use_userinput_zone;`
	`2773`	`+ uint32_t userinput_zone_activated; /* Whether the userinput zone is currently active */`
	`2774`	`+ bool enable_userinput_isolation; /* Whether to switch to the userinput zone before handling user inputs */`
`2774`	`2775`	`} zend_alloc_globals;`
`2775`	`2776`
`2776`	`2777`	`#ifdef ZTS`
`@@ -2841,25 +2842,34 @@ ZEND_API bool is_zend_ptr(const void *ptr)`
`2841`	`2842`	`ZEND_API void zend_mm_userinput_begin(void)`
`2842`	`2843`	`{`
`2843`	`2844`	`#if ZEND_MM_HEAP_PROTECTION`
`2844`		`- AG(use_userinput_zone)++;`
`2845`		`- AG(mm_heap)->zone_free_slot = ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_USERINPUT);`
	`2845`	`+ if (AG(enable_userinput_isolation)) {`
	`2846`	`+ AG(userinput_zone_activated)++;`
	`2847`	`+ AG(mm_heap)->zone_free_slot = ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_USERINPUT);`
	`2848`	`+ }`
`2846`	`2849`	`#endif`
`2847`	`2850`	`}`
`2848`	`2851`
`2849`	`2852`	`ZEND_API void zend_mm_userinput_end(void)`
`2850`	`2853`	`{`
`2851`	`2854`	`#if ZEND_MM_HEAP_PROTECTION`
`2852`		`- AG(use_userinput_zone)--;`
`2853`		`- if (!AG(use_userinput_zone)) {`
`2854`		`- AG(mm_heap)->zone_free_slot = ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_DEFAULT);`
	`2855`	`+ if (AG(enable_userinput_isolation)) {`
	`2856`	`+ AG(userinput_zone_activated)--;`
	`2857`	`+ if (!AG(userinput_zone_activated)) {`
	`2858`	`+ AG(mm_heap)->zone_free_slot = ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_DEFAULT);`
	`2859`	`+ }`
`2855`	`2860`	`}`
`2856`	`2861`	`#endif`
`2857`	`2862`	`}`
`2858`	`2863`
`2859`	`2864`	`ZEND_API void zend_mm_check_in_userinput(void)`
`2860`	`2865`	`{`
`2861`	`2866`	`#if ZEND_MM_HEAP_PROTECTION`
`2862`		`- ZEND_ASSERT(AG(use_userinput_zone));`
	`2867`	`+ if (AG(enable_userinput_isolation)) {`
	`2868`	`+ ZEND_ASSERT(AG(userinput_zone_activated));`
	`2869`	`+ ZEND_ASSERT(AG(mm_heap)->zone_free_slot == ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_USERINPUT));`
	`2870`	`+ } else {`
	`2871`	`+ ZEND_ASSERT(AG(mm_heap)->zone_free_slot == ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_DEFAULT));`
	`2872`	`+ }`
`2863`	`2873`	`#endif`
`2864`	`2874`	`}`
`2865`	`2875`
`@@ -3160,9 +3170,11 @@ ZEND_API void shutdown_memory_manager(bool silent, bool full_shutdown)`
`3160`	`3170`	`zend_mm_shutdown(AG(mm_heap), full_shutdown, silent);`
`3161`	`3171`
`3162`	`3172`	`if (!full_shutdown) {`
`3163`		`- ZEND_ASSERT(AG(use_userinput_zone) == 0 \|\| silent);`
`3164`		`- AG(use_userinput_zone) = 0;`
`3165`		`- zend_mm_userinput_begin();`
	`3173`	`+ if (AG(enable_userinput_isolation)) {`
	`3174`	`+ ZEND_ASSERT(AG(userinput_zone_activated) == 0 \|\| silent);`
	`3175`	`+ AG(userinput_zone_activated) = 0;`
	`3176`	`+ zend_mm_userinput_begin();`
	`3177`	`+ }`
`3166`	`3178`	`}`
`3167`	`3179`	`}`
`3168`	`3180`
`@@ -3477,7 +3489,9 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)`
`3477`	`3489`	`{`
`3478`	`3490`	`char *tmp;`
`3479`	`3491`
`3480`		`- alloc_globals->use_userinput_zone = 0;`
	`3492`	`+ tmp = getenv("ZEND_MM_USERINPUT_ISOLATION");`
	`3493`	`+ alloc_globals->enable_userinput_isolation = !(tmp && !ZEND_ATOL(tmp));`
	`3494`	`+ alloc_globals->userinput_zone_activated = 0;`
`3481`	`3495`
`3482`	`3496`	`#if ZEND_MM_CUSTOM`
`3483`	`3497`	`tmp = getenv("USE_ZEND_ALLOC");`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5e7fb2c

File tree

1 file changed

1 file changed

`‎Zend/zend_alloc.c‎`

0 commit comments