1 suhosin hardening patch
3 this patch was downloaded from:
5 http://download.suhosin.org/suhosin-patch-5.3.4-0.9.10.patch.gz
7 the following modifications have been made:
9 * removed changes to ./configure & ./main/php_config.h.in since those
10 files are autogenerated
11 * "quilt refresh" has been run to clean up the offsets, etc
12 * logo patch disabled (needs porting to DATA_URIs)
13 * expose php disabled (unref symbols)
14 --- php-5.5.0alpha1/Zend/Makefile.am~ 2012-11-13 22:00:16.000000000 +0200
15 +++ php-5.5.0alpha1/Zend/Makefile.am 2012-11-17 13:37:04.263279745 +0200
17 zend_default_classes.c \
18 zend_iterators.c zend_interfaces.c zend_exceptions.c \
19 zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \
21 + zend_generators.c zend_canary.c zend_alloc_canary.c
24 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
27 @@ -251,6 +251,14 @@ SOURCE=.\zend_strtod.c
31 +SOURCE=.\zend_canary.c
\r
33 +# Begin Source File
\r
35 +SOURCE=.\zend_alloc_canary.c
\r
37 +# Begin Source File
\r
39 SOURCE=.\zend_ts_hash.c
\r
44 @@ -281,6 +281,14 @@ SOURCE=.\zend_strtod.c
48 +SOURCE=.\zend_canary.c
\r
50 +# Begin Source File
\r
52 +SOURCE=.\zend_alloc_canary.c
\r
54 +# Begin Source File
\r
56 SOURCE=.\zend_ts_hash.c
\r
61 @@ -61,6 +61,10 @@ int (*zend_vspprintf)(char **pbuf, size_
62 ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
63 ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRMLS_DC);
66 +ZEND_API void (*zend_suhosin_log)(int loglevel, char *fmt, ...);
69 void (*zend_on_timeout)(int seconds TSRMLS_DC);
71 static void (*zend_message_dispatcher_p)(long message, const void *data TSRMLS_DC);
72 @@ -102,6 +106,74 @@ static ZEND_INI_MH(OnUpdateScriptEncodin
77 +static ZEND_INI_MH(OnUpdateSuhosin_log_syslog)
80 + SPG(log_syslog) = S_ALL & ~S_SQL | S_MEMORY;
82 + SPG(log_syslog) = atoi(new_value) | S_MEMORY;
86 +static ZEND_INI_MH(OnUpdateSuhosin_log_syslog_facility)
89 + SPG(log_syslog_facility) = LOG_USER;
91 + SPG(log_syslog_facility) = atoi(new_value);
95 +static ZEND_INI_MH(OnUpdateSuhosin_log_syslog_priority)
98 + SPG(log_syslog_priority) = LOG_ALERT;
100 + SPG(log_syslog_priority) = atoi(new_value);
104 +static ZEND_INI_MH(OnUpdateSuhosin_log_sapi)
107 + SPG(log_sapi) = S_ALL & ~S_SQL;
109 + SPG(log_sapi) = atoi(new_value);
113 +static ZEND_INI_MH(OnUpdateSuhosin_log_script)
116 + SPG(log_script) = S_ALL & ~S_MEMORY;
118 + SPG(log_script) = atoi(new_value) & (~S_MEMORY) & (~S_INTERNAL);
122 +static ZEND_INI_MH(OnUpdateSuhosin_log_scriptname)
124 + if (SPG(log_scriptname)) {
125 + pefree(SPG(log_scriptname),1);
127 + SPG(log_scriptname) = NULL;
129 + SPG(log_scriptname) = pestrdup(new_value,1);
133 +static ZEND_INI_MH(OnUpdateSuhosin_log_phpscript)
136 + SPG(log_phpscript) = S_ALL & ~S_MEMORY;
138 + SPG(log_phpscript) = atoi(new_value) & (~S_MEMORY) & (~S_INTERNAL);
145 ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting)
146 STD_ZEND_INI_BOOLEAN("zend.enable_gc", "1", ZEND_INI_ALL, OnUpdateGCEnabled, gc_enabled, zend_gc_globals, gc_globals)
149 @@ -688,6 +688,9 @@ extern ZEND_API int (*zend_stream_open_f
150 extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap);
151 extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
152 extern ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRMLS_DC);
154 +extern ZEND_API void (*zend_suhosin_log)(int loglevel, char *fmt, ...);
157 ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
159 @@ -849,6 +852,16 @@ ZEND_API void zend_restore_error_handlin
160 #define DEBUG_BACKTRACE_PROVIDE_OBJECT (1<<0)
161 #define DEBUG_BACKTRACE_IGNORE_ARGS (1<<1)
164 +#include "suhosin_globals.h"
165 +#include "suhosin_patch.h"
166 +#include "php_syslog.h"
168 +ZEND_API void zend_canary(void *buf, int len);
169 +ZEND_API char suhosin_get_config(int element);
176 --- a/Zend/zend_alloc.c
177 +++ b/Zend/zend_alloc.c
183 +#include "suhosin_patch.h"
187 # include <wincrypt.h>
188 # include <process.h>
190 # define PTR_FMT "0x%0.8lx"
193 +#ifndef SUHOSIN_MM_CLONE_FILE
195 void zend_debug_alloc_output(char *format, ...)
197 @@ -76,6 +81,7 @@ void zend_debug_alloc_output(char *forma
203 #if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX)
204 static void zend_mm_panic(const char *message) __attribute__ ((noreturn));
205 @@ -134,6 +140,8 @@ static void zend_mm_panic(const char *me
209 +static zend_intptr_t SUHOSIN_POINTER_GUARD = 0;
211 static zend_mm_storage* zend_mm_mem_dummy_init(void *params)
213 return malloc(sizeof(zend_mm_storage));
214 @@ -332,13 +340,28 @@ static const zend_mm_mem_handlers mem_ha
215 #define MEM_BLOCK_GUARD 0x2A8FCC84
216 #define MEM_BLOCK_LEAK 0x6C5E8F2D
218 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
219 +# define CANARY_SIZE sizeof(size_t)
221 +# define CANARY_SIZE 0
225 typedef struct _zend_mm_block_info {
231 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
238 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
242 } zend_mm_block_info;
245 @@ -412,7 +435,7 @@ typedef struct _zend_mm_free_block {
246 # define ZEND_MM_CACHE_STAT 0
249 -struct _zend_mm_heap {
250 +typedef struct _zend_mm_heap {
252 void *(*_malloc)(size_t);
253 void (*_free)(void*);
254 @@ -448,6 +471,9 @@ struct _zend_mm_heap {
256 } cache_stat[ZEND_MM_NUM_BUCKETS+1];
259 + size_t canary_1,canary_2,canary_3;
263 #define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
264 @@ -525,18 +551,31 @@ static unsigned int _zend_mm_cookie = 0;
265 /* optimized access */
266 #define ZEND_MM_FREE_BLOCK_SIZE(b) (b)->info._size
268 +#ifndef ZEND_MM_ALIGNMENT
269 +# define ZEND_MM_ALIGNMENT 8
270 +# define ZEND_MM_ALIGNMENT_LOG2 3
271 +#elif ZEND_MM_ALIGNMENT < 4
272 +# undef ZEND_MM_ALIGNMENT
273 +# undef ZEND_MM_ALIGNMENT_LOG2
274 +# define ZEND_MM_ALIGNMENT 4
275 +# define ZEND_MM_ALIGNMENT_LOG2 2
278 +#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1)
280 /* Aligned header size */
281 +#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
282 #define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block))
283 #define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block))
284 -#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE)
285 +#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE + CANARY_SIZE)
286 #define ZEND_MM_ALIGNED_MIN_HEADER_SIZE (ZEND_MM_MIN_ALLOC_BLOCK_SIZE>ZEND_MM_ALIGNED_FREE_HEADER_SIZE?ZEND_MM_MIN_ALLOC_BLOCK_SIZE:ZEND_MM_ALIGNED_FREE_HEADER_SIZE)
287 #define ZEND_MM_ALIGNED_SEGMENT_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_segment))
289 -#define ZEND_MM_MIN_SIZE ((ZEND_MM_ALIGNED_MIN_HEADER_SIZE>(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE))?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE-(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE)):0)
290 +#define ZEND_MM_MIN_SIZE ((ZEND_MM_ALIGNED_MIN_HEADER_SIZE>(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE))?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE-(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE)):0)
292 #define ZEND_MM_MAX_SMALL_SIZE ((ZEND_MM_NUM_BUCKETS<<ZEND_MM_ALIGNMENT_LOG2)+ZEND_MM_ALIGNED_MIN_HEADER_SIZE)
294 -#define ZEND_MM_TRUE_SIZE(size) ((size<ZEND_MM_MIN_SIZE)?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE):(ZEND_MM_ALIGNED_SIZE(size+ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE)))
295 +#define ZEND_MM_TRUE_SIZE(size) ((size<ZEND_MM_MIN_SIZE)?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE):(ZEND_MM_ALIGNED_SIZE(size+ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE)))
297 #define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
299 @@ -598,6 +637,44 @@ static unsigned int _zend_mm_cookie = 0;
303 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
305 +# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) do { \
306 + char *p = SUHOSIN_MM_END_CANARY_PTR(block); size_t check; \
307 + if (((block)->info.canary_1 != heap->canary_1) || ((block)->info.canary_2 != heap->canary_2)) { \
309 + zend_suhosin_log(S_MEMORY, "canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \
310 + if (SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) == 0) { _exit(1); } else { (block)->info.canary_1 = heap->canary_1; (block)->info.canary_2 = heap->canary_2; }\
312 + memcpy(&check, p, CANARY_SIZE); \
313 + if (check != heap->canary_3) { \
314 + zend_suhosin_log(S_MEMORY, "end canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \
315 + if (SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) == 0) { _exit(1); } else { memcpy(p, heap->canary_3, CANARY_SIZE); } \
319 +# define SUHOSIN_MM_SET_CANARIES(block) do { \
320 + (block)->info.canary_1 = heap->canary_1; \
321 + (block)->info.canary_2 = heap->canary_2; \
324 +# define SUHOSIN_MM_END_CANARY_PTR(block) \
325 + (char *)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block*)(block))->info.size + END_MAGIC_SIZE)
327 +# define SUHOSIN_MM_SET_END_CANARY(block) do { \
328 + char *p = SUHOSIN_MM_END_CANARY_PTR(block); \
329 + memcpy(p, &heap->canary_3, CANARY_SIZE); \
334 +# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION)
335 +# define SUHOSIN_MM_SET_CANARIES(block)
336 +# define SUHOSIN_MM_END_CANARY_PTR(block)
337 +# define SUHOSIN_MM_SET_END_CANARY(block)
342 #if ZEND_MM_HEAP_PROTECTION
344 @@ -720,7 +797,7 @@ static inline unsigned int zend_mm_low_b
348 -static inline void zend_mm_add_to_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block)
349 +static void zend_mm_add_to_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block)
353 @@ -737,7 +814,7 @@ static inline void zend_mm_add_to_free_l
356 mm_block->parent = p;
357 - mm_block->prev_free_block = mm_block->next_free_block = mm_block;
358 + mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block);
359 heap->large_free_bitmap |= (ZEND_MM_LONG_CONST(1) << index);
362 @@ -750,15 +827,15 @@ static inline void zend_mm_add_to_free_l
365 mm_block->parent = p;
366 - mm_block->prev_free_block = mm_block->next_free_block = mm_block;
367 + mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block);
371 - zend_mm_free_block *next = prev->next_free_block;
372 + zend_mm_free_block *next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
374 - prev->next_free_block = next->prev_free_block = mm_block;
375 - mm_block->next_free_block = next;
376 - mm_block->prev_free_block = prev;
377 + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
378 + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
379 + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
380 mm_block->parent = NULL;
383 @@ -770,14 +847,14 @@ static inline void zend_mm_add_to_free_l
384 index = ZEND_MM_BUCKET_INDEX(size);
386 prev = ZEND_MM_SMALL_FREE_BUCKET(heap, index);
387 - if (prev->prev_free_block == prev) {
388 + if (SUHOSIN_MANGLE_PTR(prev->prev_free_block) == prev) {
389 heap->free_bitmap |= (ZEND_MM_LONG_CONST(1) << index);
391 - next = prev->next_free_block;
392 + next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
394 - mm_block->prev_free_block = prev;
395 - mm_block->next_free_block = next;
396 - prev->next_free_block = next->prev_free_block = mm_block;
397 + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
398 + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
399 + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
403 @@ -791,6 +868,12 @@ static inline void zend_mm_remove_from_f
404 if (EXPECTED(prev == mm_block)) {
405 zend_mm_free_block **rp, **cp;
408 + if (next != mm_block) {
409 + zend_suhosin_log(S_MEMORY, "zend_mm_heap corrupted at %p", mm_block);
413 #if ZEND_MM_SAFE_UNLINKING
414 if (UNEXPECTED(next != mm_block)) {
415 zend_mm_panic("zend_mm_heap corrupted");
416 @@ -829,14 +912,21 @@ subst_block:
421 + if (SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block || SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block) {
422 + zend_suhosin_log(S_MEMORY, "zend_mm_head corrupted at %p", mm_block);
427 #if ZEND_MM_SAFE_UNLINKING
428 - if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) {
429 + if (UNEXPECTED(SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block) || UNEXPECTED(SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block)) {
430 zend_mm_panic("zend_mm_heap corrupted");
434 - prev->next_free_block = next;
435 - next->prev_free_block = prev;
436 + prev->next_free_block = SUHOSIN_MANGLE_PTR(next);
437 + next->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
439 if (EXPECTED(ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block)))) {
440 if (EXPECTED(prev == next)) {
441 @@ -854,7 +944,7 @@ subst_block:
445 -static inline void zend_mm_add_to_rest_list(zend_mm_heap *heap, zend_mm_free_block *mm_block)
446 +static void zend_mm_add_to_rest_list(zend_mm_heap *heap, zend_mm_free_block *mm_block)
448 zend_mm_free_block *prev, *next;
450 @@ -878,14 +968,14 @@ static inline void zend_mm_add_to_rest_l
452 ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_FREED);
454 - prev = heap->rest_buckets[0];
455 - next = prev->next_free_block;
456 - mm_block->prev_free_block = prev;
457 - mm_block->next_free_block = next;
458 - prev->next_free_block = next->prev_free_block = mm_block;
459 + prev = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]);
460 + next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
461 + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
462 + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
463 + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
466 -static inline void zend_mm_init(zend_mm_heap *heap)
467 +static void zend_mm_init(zend_mm_heap *heap)
469 zend_mm_free_block* p;
471 @@ -903,13 +993,21 @@ static inline void zend_mm_init(zend_mm_
473 p = ZEND_MM_SMALL_FREE_BUCKET(heap, 0);
474 for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
475 - p->next_free_block = p;
476 - p->prev_free_block = p;
477 + p->next_free_block = SUHOSIN_MANGLE_PTR(p);
478 + p->prev_free_block = SUHOSIN_MANGLE_PTR(p);
479 p = (zend_mm_free_block*)((char*)p + sizeof(zend_mm_free_block*) * 2);
480 heap->large_free_buckets[i] = NULL;
482 - heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap);
483 + heap->rest_buckets[0] = heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(heap));
484 heap->rest_count = 0;
487 + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) {
488 + zend_canary(&heap->canary_1, sizeof(heap->canary_1));
489 + zend_canary(&heap->canary_2, sizeof(heap->canary_2));
490 + zend_canary(&heap->canary_3, sizeof(heap->canary_3));
495 static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
496 @@ -930,12 +1028,13 @@ static void zend_mm_free_cache(zend_mm_h
499 for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
500 + /* NULL means NULL even MANGLED */
501 if (heap->cache[i]) {
502 - zend_mm_free_block *mm_block = heap->cache[i];
503 + zend_mm_free_block *mm_block = SUHOSIN_MANGLE_PTR(heap->cache[i]);
506 size_t size = ZEND_MM_BLOCK_SIZE(mm_block);
507 - zend_mm_free_block *q = mm_block->prev_free_block;
508 + zend_mm_free_block *q = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block);
509 zend_mm_block *next_block = ZEND_MM_NEXT_BLOCK(mm_block);
511 heap->cached -= size;
512 @@ -1031,14 +1130,20 @@ static void zend_mm_random(unsigned char
518 * - This function may alter the block_sizes values to match platform alignment
519 * - This function does *not* perform sanity checks on the arguments
521 -ZEND_API zend_mm_heap *zend_mm_startup_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params)
522 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
523 +zend_mm_heap *__zend_mm_startup_canary_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params)
525 +static zend_mm_heap *__zend_mm_startup_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params)
528 zend_mm_storage *storage;
530 + zend_mm_free_block *tmp;
534 @@ -1072,6 +1177,12 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
538 + /* get the pointer guardian and ensure low 3 bits are 1 */
539 + if (SUHOSIN_POINTER_GUARD == 0) {
540 + zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD));
541 + SUHOSIN_POINTER_GUARD |= 7;
544 if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) {
545 fprintf(stderr, "'block_size' must be a power of two\n");
546 /* See http://support.microsoft.com/kb/190351 */
547 @@ -1119,12 +1230,12 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
548 heap->reserve = NULL;
549 heap->reserve_size = reserve_size;
550 if (reserve_size > 0) {
551 - heap->reserve = _zend_mm_alloc_int(heap, reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
552 + heap->reserve = _zend_mm_alloc(heap, reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
556 zend_mm_free_block *p, *q, *orig;
557 - zend_mm_heap *mm_heap = _zend_mm_alloc_int(heap, sizeof(zend_mm_heap) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
558 + zend_mm_heap *mm_heap = _zend_mm_alloc(heap, sizeof(zend_mm_heap) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
562 @@ -1132,22 +1243,22 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
563 orig = ZEND_MM_SMALL_FREE_BUCKET(heap, 0);
564 for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
566 - while (q->prev_free_block != orig) {
567 - q = q->prev_free_block;
568 + while (SUHOSIN_MANGLE_PTR(q->prev_free_block) != orig) {
569 + q = SUHOSIN_MANGLE_PTR(q->prev_free_block);
571 - q->prev_free_block = p;
572 + q->prev_free_block = SUHOSIN_MANGLE_PTR(p);
574 - while (q->next_free_block != orig) {
575 - q = q->next_free_block;
576 + while (SUHOSIN_MANGLE_PTR(q->next_free_block) != orig) {
577 + q = SUHOSIN_MANGLE_PTR(q->next_free_block);
579 - q->next_free_block = p;
580 + q->next_free_block = SUHOSIN_MANGLE_PTR(p);
581 p = (zend_mm_free_block*)((char*)p + sizeof(zend_mm_free_block*) * 2);
582 orig = (zend_mm_free_block*)((char*)orig + sizeof(zend_mm_free_block*) * 2);
583 if (mm_heap->large_free_buckets[i]) {
584 mm_heap->large_free_buckets[i]->parent = &mm_heap->large_free_buckets[i];
587 - mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(mm_heap);
588 + mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(mm_heap));
589 mm_heap->rest_count = 0;
592 @@ -1156,7 +1267,11 @@ ZEND_API zend_mm_heap *zend_mm_startup_e
596 -ZEND_API zend_mm_heap *zend_mm_startup(void)
597 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
598 +zend_mm_heap *__zend_mm_startup_canary(void)
600 +static zend_mm_heap *__zend_mm_startup(void)
605 @@ -1226,6 +1341,27 @@ ZEND_API zend_mm_heap *zend_mm_startup(v
609 +#ifndef SUHOSIN_MM_CLONE_FILE
610 +zend_mm_heap_canary *__zend_mm_startup_canary_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params);
611 +zend_mm_heap_canary *__zend_mm_startup_canary(void);
613 +ZEND_API zend_mm_heap *zend_mm_startup_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params)
615 + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) {
616 + return (zend_mm_heap *)__zend_mm_startup_canary_ex(handlers, block_size, reserve_size, internal, params);
618 + return __zend_mm_startup_ex(handlers, block_size, reserve_size, internal, params);
620 +ZEND_API zend_mm_heap *zend_mm_startup(void)
622 + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) {
623 + return (zend_mm_heap *)__zend_mm_startup_canary();
625 + return __zend_mm_startup();
631 static long zend_mm_find_leaks(zend_mm_segment *segment, zend_mm_block *b)
633 @@ -1594,7 +1730,11 @@ static int zend_mm_check_heap(zend_mm_he
637 -ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC)
638 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
639 +void __zend_mm_shutdown_canary(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC)
641 +static void __zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC)
644 zend_mm_storage *storage;
645 zend_mm_segment *segment;
646 @@ -1611,7 +1751,7 @@ ZEND_API void zend_mm_shutdown(zend_mm_h
650 - _zend_mm_free_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
651 + _zend_mm_free(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
654 heap->reserve = NULL;
655 @@ -1730,12 +1870,23 @@ ZEND_API void zend_mm_shutdown(zend_mm_h
656 zend_mm_add_to_free_list(heap, b);
658 if (heap->reserve_size) {
659 - heap->reserve = _zend_mm_alloc_int(heap, heap->reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
660 + heap->reserve = _zend_mm_alloc(heap, heap->reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
666 +#ifndef SUHOSIN_MM_CLONE_FILE
667 +ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC)
669 + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) {
670 + __zend_mm_shutdown_canary(heap, full_shutdown, silent TSRMLS_CC);
673 + __zend_mm_shutdown(heap, full_shutdown, silent TSRMLS_CC);
677 static void zend_mm_safe_error(zend_mm_heap *heap,
680 @@ -1746,7 +1897,11 @@ static void zend_mm_safe_error(zend_mm_h
684 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
685 + _zend_mm_free_canary_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
687 _zend_mm_free_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
689 heap->reserve = NULL;
691 if (heap->overflow == 0) {
692 @@ -1821,7 +1976,7 @@ static zend_mm_free_block *zend_mm_searc
693 p = heap->large_free_buckets[index];
694 for (m = true_size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) {
695 if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
696 - return p->next_free_block;
697 + return SUHOSIN_MANGLE_PTR(p->next_free_block);
698 } else if (ZEND_MM_FREE_BLOCK_SIZE(p) >= true_size &&
699 ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
700 best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
701 @@ -1845,7 +2000,7 @@ static zend_mm_free_block *zend_mm_searc
703 for (p = rst; p; p = p->child[p->child[0] != NULL]) {
704 if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
705 - return p->next_free_block;
706 + return SUHOSIN_MANGLE_PTR(p->next_free_block);
707 } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size &&
708 ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
709 best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
710 @@ -1854,7 +2009,7 @@ static zend_mm_free_block *zend_mm_searc
714 - return best_fit->next_free_block;
715 + return SUHOSIN_MANGLE_PTR(best_fit->next_free_block);
717 bitmap = bitmap >> 1;
719 @@ -1870,9 +2025,12 @@ static zend_mm_free_block *zend_mm_searc
723 - return best_fit->next_free_block;
724 + return SUHOSIN_MANGLE_PTR(best_fit->next_free_block);
728 +void *_zend_mm_alloc_canary_int(zend_mm_heap_canary *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
730 static void *_zend_mm_alloc_int(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
732 zend_mm_free_block *best_fit;
733 @@ -1902,9 +2060,14 @@ static void *_zend_mm_alloc_int(zend_mm_
734 heap->cache_stat[index].count--;
735 heap->cache_stat[index].hit++;
737 - best_fit = heap->cache[index];
738 + best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]);
739 heap->cache[index] = best_fit->prev_free_block;
740 heap->cached -= true_size;
742 + SUHOSIN_MM_SET_CANARIES(best_fit);
743 + ((zend_mm_block*)best_fit)->info.size = size;
744 + SUHOSIN_MM_SET_END_CANARY(best_fit);
746 ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
747 ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
748 HANDLE_UNBLOCK_INTERRUPTIONS();
749 @@ -1919,7 +2082,7 @@ static void *_zend_mm_alloc_int(zend_mm_
751 /* Found some "small" free block that can be used */
752 index += zend_mm_low_bit(bitmap);
753 - best_fit = heap->free_buckets[index*2];
754 + best_fit = SUHOSIN_MANGLE_PTR(heap->free_buckets[index*2]);
755 #if ZEND_MM_CACHE_STAT
756 heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit++;
758 @@ -1934,7 +2097,7 @@ static void *_zend_mm_alloc_int(zend_mm_
759 best_fit = zend_mm_search_large_block(heap, true_size);
761 if (!best_fit && heap->real_size >= heap->limit - heap->block_size) {
762 - zend_mm_free_block *p = heap->rest_buckets[0];
763 + zend_mm_free_block *p = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]);
764 size_t best_size = -1;
766 while (p != ZEND_MM_REST_BUCKET(heap)) {
767 @@ -1946,7 +2109,7 @@ static void *_zend_mm_alloc_int(zend_mm_
768 best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
771 - p = p->prev_free_block;
772 + p = SUHOSIN_MANGLE_PTR(p->prev_free_block);
776 @@ -2042,13 +2205,19 @@ zend_mm_finished_searching_for_block:
778 ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
781 + SUHOSIN_MM_SET_CANARIES(best_fit);
782 + ((zend_mm_block*)best_fit)->info.size = size;
783 + SUHOSIN_MM_SET_END_CANARY(best_fit);
786 heap->size += true_size;
787 if (heap->peak < heap->size) {
788 heap->peak = heap->size;
791 HANDLE_UNBLOCK_INTERRUPTIONS();
794 return ZEND_MM_DATA_OF(best_fit);
797 @@ -2069,19 +2238,26 @@ static void _zend_mm_free_int(zend_mm_he
799 mm_block = ZEND_MM_HEADER_OF(p);
800 size = ZEND_MM_BLOCK_SIZE(mm_block);
802 + SUHOSIN_MM_CHECK_CANARIES(mm_block, "efree()");
804 ZEND_MM_CHECK_PROTECTION(mm_block);
806 #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
807 memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->debug.size);
811 + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_DESTROY_FREE_MEMORY))) {
812 + memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->info.size);
816 if (EXPECTED(ZEND_MM_SMALL_SIZE(size)) && EXPECTED(heap->cached < ZEND_MM_CACHE_SIZE)) {
817 size_t index = ZEND_MM_BUCKET_INDEX(size);
818 zend_mm_free_block **cache = &heap->cache[index];
820 ((zend_mm_free_block*)mm_block)->prev_free_block = *cache;
821 - *cache = (zend_mm_free_block*)mm_block;
822 + *cache = (zend_mm_free_block*)SUHOSIN_MANGLE_PTR(mm_block);
823 heap->cached += size;
824 ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED);
825 #if ZEND_MM_CACHE_STAT
826 @@ -2116,6 +2292,9 @@ static void _zend_mm_free_int(zend_mm_he
827 HANDLE_UNBLOCK_INTERRUPTIONS();
831 +void *_zend_mm_realloc_canary_int(zend_mm_heap_canary *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
833 static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
835 zend_mm_block *mm_block = ZEND_MM_HEADER_OF(p);
836 @@ -2127,7 +2306,11 @@ static void *_zend_mm_realloc_int(zend_m
839 if (UNEXPECTED(!p) || !ZEND_MM_VALID_PTR(p)) {
840 +#ifdef SUHOSIN_MM_WITH_CANARY_PROTECTION
841 + return _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
843 return _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
847 HANDLE_BLOCK_INTERRUPTIONS();
848 @@ -2135,6 +2318,9 @@ static void *_zend_mm_realloc_int(zend_m
849 mm_block = ZEND_MM_HEADER_OF(p);
850 true_size = ZEND_MM_TRUE_SIZE(size);
851 orig_size = ZEND_MM_BLOCK_SIZE(mm_block);
853 + SUHOSIN_MM_CHECK_CANARIES(mm_block, "erealloc()");
855 ZEND_MM_CHECK_PROTECTION(mm_block);
857 if (UNEXPECTED(true_size < size)) {
858 @@ -2165,6 +2351,11 @@ static void *_zend_mm_realloc_int(zend_m
860 ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
861 HANDLE_UNBLOCK_INTERRUPTIONS();
863 + SUHOSIN_MM_SET_CANARIES(mm_block);
864 + ((zend_mm_block*)mm_block)->info.size = size;
865 + SUHOSIN_MM_SET_END_CANARY(mm_block);
870 @@ -2180,17 +2371,22 @@ static void *_zend_mm_realloc_int(zend_m
871 heap->cache_stat[index].count--;
872 heap->cache_stat[index].hit++;
874 - best_fit = heap->cache[index];
875 + best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]);
876 heap->cache[index] = best_fit->prev_free_block;
877 ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
878 - ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
880 + ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
882 + SUHOSIN_MM_SET_CANARIES(best_fit);
883 + ((zend_mm_block*)best_fit)->info.size = size;
884 + SUHOSIN_MM_SET_END_CANARY(best_fit);
887 ptr = ZEND_MM_DATA_OF(best_fit);
889 #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
890 memcpy(ptr, p, mm_block->debug.size);
892 - memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE);
893 + memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE);
896 heap->cached -= true_size - orig_size;
897 @@ -2199,7 +2395,7 @@ static void *_zend_mm_realloc_int(zend_m
898 cache = &heap->cache[index];
900 ((zend_mm_free_block*)mm_block)->prev_free_block = *cache;
901 - *cache = (zend_mm_free_block*)mm_block;
902 + *cache = (zend_mm_free_block*)SUHOSIN_MANGLE_PTR(mm_block);
903 ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED);
904 #if ZEND_MM_CACHE_STAT
905 if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) {
906 @@ -2249,6 +2445,11 @@ static void *_zend_mm_realloc_int(zend_m
907 heap->peak = heap->size;
909 HANDLE_UNBLOCK_INTERRUPTIONS();
911 + SUHOSIN_MM_SET_CANARIES(mm_block);
912 + ((zend_mm_block*)mm_block)->info.size = size;
913 + SUHOSIN_MM_SET_END_CANARY(mm_block);
916 } else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
917 ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(next_block, ZEND_MM_FREE_BLOCK_SIZE(next_block)))) {
918 @@ -2349,39 +2550,75 @@ out_of_memory:
921 HANDLE_UNBLOCK_INTERRUPTIONS();
923 + SUHOSIN_MM_SET_CANARIES(mm_block);
924 + ((zend_mm_block*)mm_block)->info.size = size;
925 + SUHOSIN_MM_SET_END_CANARY(mm_block);
927 return ZEND_MM_DATA_OF(mm_block);
930 +#ifdef SUHOSIN_MM_WITH_CANARY_PROTECTION
931 + ptr = _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
933 ptr = _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
935 #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
936 memcpy(ptr, p, mm_block->debug.size);
938 - memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE);
939 + memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE);
941 +#ifdef SUHOSIN_MM_WITH_CANARY_PROTECTION
942 + _zend_mm_free_canary_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
944 + _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
946 - _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
947 HANDLE_UNBLOCK_INTERRUPTIONS();
951 +#ifndef SUHOSIN_MM_CLONE_FILE
952 ZEND_API void *_zend_mm_alloc(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
954 - return _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
956 + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0))
958 + return _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
960 + return _zend_mm_alloc_canary_int((zend_mm_heap_canary *)heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
964 ZEND_API void _zend_mm_free(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
966 - _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
968 + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0))
970 + { _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); return; }
972 + _zend_mm_free_canary_int((zend_mm_heap_canary *)heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
976 ZEND_API void *_zend_mm_realloc(zend_mm_heap *heap, void *ptr, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
978 - return _zend_mm_realloc_int(heap, ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
980 + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0))
982 + return _zend_mm_realloc_int(heap, ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
984 + return _zend_mm_realloc_canary_int((zend_mm_heap_canary *)heap, ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
988 ZEND_API size_t _zend_mm_block_size(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
990 zend_mm_block *mm_block;
992 + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) != 0) {
993 + return _zend_mm_block_size_canary((zend_mm_heap_canary *)heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
996 if (!ZEND_MM_VALID_PTR(p)) {
999 @@ -2393,6 +2630,24 @@ ZEND_API size_t _zend_mm_block_size(zend
1000 return ZEND_MM_BLOCK_SIZE(mm_block);
1004 +ZEND_API size_t _zend_mm_block_size_canary(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
1006 + zend_mm_block *mm_block;
1008 + if (!ZEND_MM_VALID_PTR(p)) {
1011 + mm_block = ZEND_MM_HEADER_OF(p);
1012 + ZEND_MM_CHECK_PROTECTION(mm_block);
1013 +#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
1014 + return mm_block->debug.size;
1016 + return ZEND_MM_BLOCK_SIZE(mm_block);
1022 /**********************/
1023 /* Allocation Manager */
1024 @@ -2410,6 +2665,7 @@ static int alloc_globals_id;
1025 static zend_alloc_globals alloc_globals;
1028 +#ifndef SUHOSIN_MM_CLONE_FILE
1029 ZEND_API int is_zend_mm(TSRMLS_D)
1031 return AG(mm_heap)->use_zend_alloc;
1032 @@ -2422,7 +2678,13 @@ ZEND_API void *_emalloc(size_t size ZEND
1033 if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
1034 return AG(mm_heap)->_malloc(size);
1037 + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0))
1039 return _zend_mm_alloc_int(AG(mm_heap), size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
1041 + return _zend_mm_alloc_canary_int((zend_mm_heap_canary *)AG(mm_heap), size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
1045 ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
1046 @@ -2433,7 +2695,13 @@ ZEND_API void _efree(void *ptr ZEND_FILE
1047 AG(mm_heap)->_free(ptr);
1050 - _zend_mm_free_int(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
1052 + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0))
1054 + { _zend_mm_free_int(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); return; }
1056 + _zend_mm_free_canary_int((zend_mm_heap_canary *)AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
1060 ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
1061 @@ -2443,7 +2711,13 @@ ZEND_API void *_erealloc(void *ptr, size
1062 if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
1063 return AG(mm_heap)->_realloc(ptr, size);
1066 + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0))
1068 return _zend_mm_realloc_int(AG(mm_heap), ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
1070 + return _zend_mm_realloc_canary_int((zend_mm_heap_canary *)AG(mm_heap), ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
1074 ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
1075 @@ -2451,8 +2725,15 @@ ZEND_API size_t _zend_mem_block_size(voi
1076 if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
1079 - return _zend_mm_block_size(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
1081 + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0))
1083 + return _zend_mm_block_size(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
1085 + return _zend_mm_block_size_canary((zend_mm_heap_canary *)AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
1090 #if defined(__GNUC__) && defined(i386)
1092 @@ -2523,7 +2804,7 @@ static inline size_t safe_address(size_t
1097 +#ifndef SUHOSIN_MM_CLONE_FILE
1098 ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
1100 return emalloc_rel(safe_address(nmemb, size, offset));
1101 @@ -2663,6 +2944,7 @@ ZEND_API void shutdown_memory_manager(in
1103 zend_mm_shutdown(AG(mm_heap), full_shutdown, silent TSRMLS_CC);
1107 static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
1109 @@ -2687,6 +2969,7 @@ static void alloc_globals_dtor(zend_allo
1113 +#ifndef SUHOSIN_MM_CLONE_FILE
1114 ZEND_API void start_memory_manager(TSRMLS_D)
1117 @@ -2751,6 +3034,7 @@ ZEND_API void _full_mem_check(int silent
1118 zend_debug_alloc_output("------------------------------------------------\n");
1125 --- a/Zend/zend_alloc.h
1126 +++ b/Zend/zend_alloc.h
1127 @@ -189,6 +189,8 @@ END_EXTERN_C()
1129 /* Heap functions */
1130 typedef struct _zend_mm_heap zend_mm_heap;
1131 +typedef struct _zend_mm_heap_canary zend_mm_heap_canary;
1134 ZEND_API zend_mm_heap *zend_mm_startup(void);
1135 ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC);
1137 +++ b/Zend/zend_alloc_canary.c
1140 + +----------------------------------------------------------------------+
1141 + | Suhosin-Patch for PHP |
1142 + +----------------------------------------------------------------------+
1143 + | Copyright (c) 2004-2010 Stefan Esser |
1144 + +----------------------------------------------------------------------+
1145 + | This source file is subject to version 2.02 of the PHP license, |
1146 + | that is bundled with this package in the file LICENSE, and is |
1147 + | available at through the world-wide-web at |
1148 + | http://www.php.net/license/2_02.txt. |
1149 + | If you did not receive a copy of the PHP license and are unable to |
1150 + | obtain it through the world-wide-web, please send a note to |
1151 + | license@php.net so we can mail you a copy immediately. |
1152 + +----------------------------------------------------------------------+
1153 + | Author: Stefan Esser <stefan.esser@sektioneins.de> |
1154 + +----------------------------------------------------------------------+
1156 +/* $Id: zend_alloc_canary.c, $ */
1159 +#include "zend_alloc.h"
1160 +#include "zend_globals.h"
1161 +#include "zend_operators.h"
1163 +#ifdef HAVE_SIGNAL_H
1164 +# include <signal.h>
1166 +#ifdef HAVE_UNISTD_H
1167 +# include <unistd.h>
1171 +#include "suhosin_patch.h"
1175 +# include <wincrypt.h>
1176 +# include <process.h>
1179 +#ifndef ZEND_MM_HEAP_PROTECTION
1180 +# define ZEND_MM_HEAP_PROTECTION ZEND_DEBUG
1183 +#ifndef ZEND_MM_SAFE_UNLINKING
1184 +# define ZEND_MM_SAFE_UNLINKING 1
1187 +#ifndef ZEND_MM_COOKIES
1188 +# define ZEND_MM_COOKIES ZEND_DEBUG
1192 +# define PTR_FMT "0x%0.16I64x"
1194 +#elif sizeof(long) == 8
1195 +# define PTR_FMT "0x%0.16lx"
1198 +# define PTR_FMT "0x%0.8lx"
1201 +#define SUHOSIN_MM_WITH_CANARY_PROTECTION 1
1203 +#if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX)
1204 +static void zend_mm_panic(const char *message) __attribute__ ((noreturn));
1207 +static void zend_mm_panic(const char *message)
1209 + fprintf(stderr, "%s\n", message);
1210 +/* See http://support.microsoft.com/kb/190351 */
1214 +#if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID)
1215 + kill(getpid(), SIGSEGV);
1220 +/*******************/
1221 +/* Storage Manager */
1222 +/*******************/
1225 +# define HAVE_MEM_WIN32 /* use VirtualAlloc() to allocate memory */
1227 +#define HAVE_MEM_MALLOC /* use malloc() to allocate segments */
1229 +#include <sys/types.h>
1230 +#include <sys/stat.h>
1232 +#include <limits.h>
1237 +#if defined(HAVE_MEM_MMAP_ANON) || defined(HAVE_MEM_MMAP_ZERO)
1238 +# ifdef HAVE_MREMAP
1239 +# ifndef _GNU_SOURCE
1240 +# define _GNU_SOURCE
1246 +# include <sys/mman.h>
1248 +# ifdef MAP_ANONYMOUS
1249 +# define MAP_ANON MAP_ANONYMOUS
1252 +# ifndef MREMAP_MAYMOVE
1253 +# define MREMAP_MAYMOVE 0
1255 +# ifndef MAP_FAILED
1256 +# define MAP_FAILED ((void*)-1)
1260 +static zend_intptr_t SUHOSIN_POINTER_GUARD = 0;
1262 +static zend_mm_storage* zend_mm_mem_dummy_init(void *params)
1264 + return malloc(sizeof(zend_mm_storage));
1267 +static void zend_mm_mem_dummy_dtor(zend_mm_storage *storage)
1272 +static void zend_mm_mem_dummy_compact(zend_mm_storage *storage)
1276 +#if defined(HAVE_MEM_MMAP_ANON) || defined(HAVE_MEM_MMAP_ZERO)
1278 +static zend_mm_segment* zend_mm_mem_mmap_realloc(zend_mm_storage *storage, zend_mm_segment* segment, size_t size)
1280 + zend_mm_segment *ret;
1282 +#if defined(__NetBSD__)
1283 + /* NetBSD 5 supports mremap but takes an extra newp argument */
1284 + ret = (zend_mm_segment*)mremap(segment, segment->size, segment, size, MREMAP_MAYMOVE);
1286 + ret = (zend_mm_segment*)mremap(segment, segment->size, size, MREMAP_MAYMOVE);
1288 + if (ret == MAP_FAILED) {
1290 + ret = storage->handlers->_alloc(storage, size);
1292 + memcpy(ret, segment, size > segment->size ? segment->size : size);
1293 + storage->handlers->_free(storage, segment);
1301 +static void zend_mm_mem_mmap_free(zend_mm_storage *storage, zend_mm_segment* segment)
1303 + munmap((void*)segment, segment->size);
1308 +#ifdef HAVE_MEM_MMAP_ANON
1310 +static zend_mm_segment* zend_mm_mem_mmap_anon_alloc(zend_mm_storage *storage, size_t size)
1312 + zend_mm_segment *ret = (zend_mm_segment*)mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
1313 + if (ret == MAP_FAILED) {
1319 +# define ZEND_MM_MEM_MMAP_ANON_DSC {"mmap_anon", zend_mm_mem_dummy_init, zend_mm_mem_dummy_dtor, zend_mm_mem_dummy_compact, zend_mm_mem_mmap_anon_alloc, zend_mm_mem_mmap_realloc, zend_mm_mem_mmap_free}
1323 +#ifdef HAVE_MEM_MMAP_ZERO
1325 +static int zend_mm_dev_zero_fd = -1;
1327 +static zend_mm_storage* zend_mm_mem_mmap_zero_init(void *params)
1329 + if (zend_mm_dev_zero_fd != -1) {
1330 + zend_mm_dev_zero_fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR);
1332 + if (zend_mm_dev_zero_fd >= 0) {
1333 + return malloc(sizeof(zend_mm_storage));
1339 +static void zend_mm_mem_mmap_zero_dtor(zend_mm_storage *storage)
1341 + close(zend_mm_dev_zero_fd);
1345 +static zend_mm_segment* zend_mm_mem_mmap_zero_alloc(zend_mm_storage *storage, size_t size)
1347 + zend_mm_segment *ret = (zend_mm_segment*)mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, zend_mm_dev_zero_fd, 0);
1348 + if (ret == MAP_FAILED) {
1354 +# define ZEND_MM_MEM_MMAP_ZERO_DSC {"mmap_zero", zend_mm_mem_mmap_zero_init, zend_mm_mem_mmap_zero_dtor, zend_mm_mem_dummy_compact, zend_mm_mem_mmap_zero_alloc, zend_mm_mem_mmap_realloc, zend_mm_mem_mmap_free}
1358 +#ifdef HAVE_MEM_WIN32
1360 +static zend_mm_storage* zend_mm_mem_win32_init(void *params)
1362 + HANDLE heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0);
1363 + zend_mm_storage* storage;
1365 + if (heap == NULL) {
1368 + storage = (zend_mm_storage*)malloc(sizeof(zend_mm_storage));
1369 + storage->data = (void*) heap;
1373 +static void zend_mm_mem_win32_dtor(zend_mm_storage *storage)
1375 + HeapDestroy((HANDLE)storage->data);
1379 +static void zend_mm_mem_win32_compact(zend_mm_storage *storage)
1381 + HeapDestroy((HANDLE)storage->data);
1382 + storage->data = (void*)HeapCreate(HEAP_NO_SERIALIZE, 0, 0);
1385 +static zend_mm_segment* zend_mm_mem_win32_alloc(zend_mm_storage *storage, size_t size)
1387 + return (zend_mm_segment*) HeapAlloc((HANDLE)storage->data, HEAP_NO_SERIALIZE, size);
1390 +static void zend_mm_mem_win32_free(zend_mm_storage *storage, zend_mm_segment* segment)
1392 + HeapFree((HANDLE)storage->data, HEAP_NO_SERIALIZE, segment);
1395 +static zend_mm_segment* zend_mm_mem_win32_realloc(zend_mm_storage *storage, zend_mm_segment* segment, size_t size)
1397 + return (zend_mm_segment*) HeapReAlloc((HANDLE)storage->data, HEAP_NO_SERIALIZE, segment, size);
1400 +# define ZEND_MM_MEM_WIN32_DSC {"win32", zend_mm_mem_win32_init, zend_mm_mem_win32_dtor, zend_mm_mem_win32_compact, zend_mm_mem_win32_alloc, zend_mm_mem_win32_realloc, zend_mm_mem_win32_free}
1404 +#ifdef HAVE_MEM_MALLOC
1406 +static zend_mm_segment* zend_mm_mem_malloc_alloc(zend_mm_storage *storage, size_t size)
1408 + return (zend_mm_segment*)malloc(size);
1411 +static zend_mm_segment* zend_mm_mem_malloc_realloc(zend_mm_storage *storage, zend_mm_segment *ptr, size_t size)
1413 + return (zend_mm_segment*)realloc(ptr, size);
1416 +static void zend_mm_mem_malloc_free(zend_mm_storage *storage, zend_mm_segment *ptr)
1421 +# define ZEND_MM_MEM_MALLOC_DSC {"malloc", zend_mm_mem_dummy_init, zend_mm_mem_dummy_dtor, zend_mm_mem_dummy_compact, zend_mm_mem_malloc_alloc, zend_mm_mem_malloc_realloc, zend_mm_mem_malloc_free}
1425 +static const zend_mm_mem_handlers mem_handlers[] = {
1426 +#ifdef HAVE_MEM_WIN32
1427 + ZEND_MM_MEM_WIN32_DSC,
1429 +#ifdef HAVE_MEM_MALLOC
1430 + ZEND_MM_MEM_MALLOC_DSC,
1432 +#ifdef HAVE_MEM_MMAP_ANON
1433 + ZEND_MM_MEM_MMAP_ANON_DSC,
1435 +#ifdef HAVE_MEM_MMAP_ZERO
1436 + ZEND_MM_MEM_MMAP_ZERO_DSC,
1438 + {NULL, NULL, NULL, NULL, NULL, NULL}
1441 +# define ZEND_MM_STORAGE_DTOR() heap->storage->handlers->dtor(heap->storage)
1442 +# define ZEND_MM_STORAGE_ALLOC(size) heap->storage->handlers->_alloc(heap->storage, size)
1443 +# define ZEND_MM_STORAGE_REALLOC(ptr, size) heap->storage->handlers->_realloc(heap->storage, ptr, size)
1444 +# define ZEND_MM_STORAGE_FREE(ptr) heap->storage->handlers->_free(heap->storage, ptr)
1450 +#define MEM_BLOCK_VALID 0x7312F8DC
1451 +#define MEM_BLOCK_FREED 0x99954317
1452 +#define MEM_BLOCK_CACHED 0xFB8277DC
1453 +#define MEM_BLOCK_GUARD 0x2A8FCC84
1454 +#define MEM_BLOCK_LEAK 0x6C5E8F2D
1456 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
1457 +# define CANARY_SIZE sizeof(size_t)
1459 +# define CANARY_SIZE 0
1462 +/* mm block type */
1463 +typedef struct _zend_mm_block_info_canary {
1464 +#if ZEND_MM_COOKIES
1467 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
1474 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
1478 +} zend_mm_block_info_canary;
1482 +typedef struct _zend_mm_debug_info_canary {
1485 + char *orig_filename;
1488 +#if ZEND_MM_HEAP_PROTECTION
1489 + unsigned int start_magic;
1491 +} zend_mm_debug_info_canary;
1493 +#elif ZEND_MM_HEAP_PROTECTION
1495 +typedef struct _zend_mm_debug_info_canary {
1497 + unsigned int start_magic;
1498 +} zend_mm_debug_info_canary;
1502 +typedef struct _zend_mm_block_canary {
1503 + zend_mm_block_info_canary info;
1505 + unsigned int magic;
1507 + THREAD_T thread_id;
1509 + zend_mm_debug_info_canary debug;
1510 +#elif ZEND_MM_HEAP_PROTECTION
1511 + zend_mm_debug_info_canary debug;
1513 +} zend_mm_block_canary;
1515 +typedef struct _zend_mm_small_free_block_canary {
1516 + zend_mm_block_info_canary info;
1518 + unsigned int magic;
1520 + THREAD_T thread_id;
1523 + struct _zend_mm_free_block_canary *prev_free_block;
1524 + struct _zend_mm_free_block_canary *next_free_block;
1525 +} zend_mm_small_free_block_canary;
1527 +typedef struct _zend_mm_free_block_canary {
1528 + zend_mm_block_info_canary info;
1530 + unsigned int magic;
1532 + THREAD_T thread_id;
1535 + struct _zend_mm_free_block_canary *prev_free_block;
1536 + struct _zend_mm_free_block_canary *next_free_block;
1538 + struct _zend_mm_free_block_canary **parent;
1539 + struct _zend_mm_free_block_canary *child[2];
1540 +} zend_mm_free_block_canary;
1542 +#define ZEND_MM_NUM_BUCKETS (sizeof(size_t) << 3)
1544 +#define ZEND_MM_CACHE 1
1545 +#define ZEND_MM_CACHE_SIZE (ZEND_MM_NUM_BUCKETS * 4 * 1024)
1547 +#ifndef ZEND_MM_CACHE_STAT
1548 +# define ZEND_MM_CACHE_STAT 0
1551 +typedef struct _zend_mm_heap_canary {
1552 + int use_zend_alloc;
1553 + void *(*_malloc)(size_t);
1554 + void (*_free)(void*);
1555 + void *(*_realloc)(void*, size_t);
1556 + size_t free_bitmap;
1557 + size_t large_free_bitmap;
1558 + size_t block_size;
1559 + size_t compact_size;
1560 + zend_mm_segment *segments_list;
1561 + zend_mm_storage *storage;
1567 + size_t reserve_size;
1572 + unsigned int cached;
1573 + zend_mm_free_block_canary *cache[ZEND_MM_NUM_BUCKETS];
1575 + zend_mm_free_block_canary *free_buckets[ZEND_MM_NUM_BUCKETS*2];
1576 + zend_mm_free_block_canary *large_free_buckets[ZEND_MM_NUM_BUCKETS];
1577 + zend_mm_free_block_canary *rest_buckets[2];
1578 +#if ZEND_MM_CACHE_STAT
1584 + } cache_stat[ZEND_MM_NUM_BUCKETS+1];
1587 + size_t canary_1,canary_2,canary_3;
1591 +#define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
1592 + (zend_mm_free_block_canary*) ((char*)&heap->free_buckets[index * 2] + \
1593 + sizeof(zend_mm_free_block_canary*) * 2 - \
1594 + sizeof(zend_mm_small_free_block_canary))
1596 +#define ZEND_MM_REST_BUCKET(heap) \
1597 + (zend_mm_free_block_canary*)((char*)&heap->rest_buckets[0] + \
1598 + sizeof(zend_mm_free_block_canary*) * 2 - \
1599 + sizeof(zend_mm_small_free_block_canary))
1601 +#if ZEND_MM_COOKIES
1603 +static unsigned int _zend_mm_cookie = 0;
1605 +# define ZEND_MM_COOKIE(block) \
1606 + (((size_t)(block)) ^ _zend_mm_cookie)
1607 +# define ZEND_MM_SET_COOKIE(block) \
1608 + (block)->info._cookie = ZEND_MM_COOKIE(block)
1609 +# define ZEND_MM_CHECK_COOKIE(block) \
1610 + if (UNEXPECTED((block)->info._cookie != ZEND_MM_COOKIE(block))) { \
1611 + zend_mm_panic("zend_mm_heap corrupted"); \
1614 +# define ZEND_MM_SET_COOKIE(block)
1615 +# define ZEND_MM_CHECK_COOKIE(block)
1618 +/* Default memory segment size */
1619 +#define ZEND_MM_SEG_SIZE (256 * 1024)
1621 +/* Reserved space for error reporting in case of memory overflow */
1622 +#define ZEND_MM_RESERVE_SIZE (8*1024)
1625 +# define ZEND_MM_LONG_CONST(x) (x##i64)
1627 +# define ZEND_MM_LONG_CONST(x) (x##L)
1630 +#define ZEND_MM_TYPE_MASK ZEND_MM_LONG_CONST(0x3)
1632 +#define ZEND_MM_FREE_BLOCK ZEND_MM_LONG_CONST(0x0)
1633 +#define ZEND_MM_USED_BLOCK ZEND_MM_LONG_CONST(0x1)
1634 +#define ZEND_MM_GUARD_BLOCK ZEND_MM_LONG_CONST(0x3)
1636 +#define ZEND_MM_BLOCK(b, type, size) do { \
1637 + size_t _size = (size); \
1638 + (b)->info._size = (type) | _size; \
1639 + ZEND_MM_BLOCK_AT(b, _size)->info._prev = (type) | _size; \
1640 + ZEND_MM_SET_COOKIE(b); \
1642 +#define ZEND_MM_LAST_BLOCK(b) do { \
1643 + (b)->info._size = ZEND_MM_GUARD_BLOCK | ZEND_MM_ALIGNED_HEADER_SIZE; \
1644 + ZEND_MM_SET_MAGIC(b, MEM_BLOCK_GUARD); \
1646 +#define ZEND_MM_BLOCK_SIZE(b) ((b)->info._size & ~ZEND_MM_TYPE_MASK)
1647 +#define ZEND_MM_IS_FREE_BLOCK(b) (!((b)->info._size & ZEND_MM_USED_BLOCK))
1648 +#define ZEND_MM_IS_USED_BLOCK(b) ((b)->info._size & ZEND_MM_USED_BLOCK)
1649 +#define ZEND_MM_IS_GUARD_BLOCK(b) (((b)->info._size & ZEND_MM_TYPE_MASK) == ZEND_MM_GUARD_BLOCK)
1651 +#define ZEND_MM_NEXT_BLOCK(b) ZEND_MM_BLOCK_AT(b, ZEND_MM_BLOCK_SIZE(b))
1652 +#define ZEND_MM_PREV_BLOCK(b) ZEND_MM_BLOCK_AT(b, -(int)((b)->info._prev & ~ZEND_MM_TYPE_MASK))
1654 +#define ZEND_MM_PREV_BLOCK_IS_FREE(b) (!((b)->info._prev & ZEND_MM_USED_BLOCK))
1656 +#define ZEND_MM_MARK_FIRST_BLOCK(b) ((b)->info._prev = ZEND_MM_GUARD_BLOCK)
1657 +#define ZEND_MM_IS_FIRST_BLOCK(b) ((b)->info._prev == ZEND_MM_GUARD_BLOCK)
1659 +/* optimized access */
1660 +#define ZEND_MM_FREE_BLOCK_SIZE(b) (b)->info._size
1662 +#ifndef ZEND_MM_ALIGNMENT
1663 +# define ZEND_MM_ALIGNMENT 8
1664 +# define ZEND_MM_ALIGNMENT_LOG2 3
1665 +#elif ZEND_MM_ALIGNMENT < 4
1666 +# undef ZEND_MM_ALIGNMENT
1667 +# undef ZEND_MM_ALIGNMENT_LOG2
1668 +# define ZEND_MM_ALIGNMENT 4
1669 +# define ZEND_MM_ALIGNMENT_LOG2 2
1672 +#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1)
1674 +/* Aligned header size */
1675 +#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
1676 +#define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block_canary))
1677 +#define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block_canary))
1678 +#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE + CANARY_SIZE)
1679 +#define ZEND_MM_ALIGNED_MIN_HEADER_SIZE (ZEND_MM_MIN_ALLOC_BLOCK_SIZE>ZEND_MM_ALIGNED_FREE_HEADER_SIZE?ZEND_MM_MIN_ALLOC_BLOCK_SIZE:ZEND_MM_ALIGNED_FREE_HEADER_SIZE)
1680 +#define ZEND_MM_ALIGNED_SEGMENT_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_segment))
1682 +#define ZEND_MM_MIN_SIZE ((ZEND_MM_ALIGNED_MIN_HEADER_SIZE>(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE))?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE-(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE)):0)
1684 +#define ZEND_MM_MAX_SMALL_SIZE ((ZEND_MM_NUM_BUCKETS<<ZEND_MM_ALIGNMENT_LOG2)+ZEND_MM_ALIGNED_MIN_HEADER_SIZE)
1686 +#define ZEND_MM_TRUE_SIZE(size) ((size<ZEND_MM_MIN_SIZE)?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE):(ZEND_MM_ALIGNED_SIZE(size+ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE)))
1688 +#define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
1690 +#define ZEND_MM_SMALL_SIZE(true_size) (true_size < ZEND_MM_MAX_SMALL_SIZE)
1692 +/* Memory calculations */
1693 +#define ZEND_MM_BLOCK_AT(blk, offset) ((zend_mm_block_canary *) (((char *) (blk))+(offset)))
1694 +#define ZEND_MM_DATA_OF(p) ((void *) (((char *) (p))+ZEND_MM_ALIGNED_HEADER_SIZE))
1695 +#define ZEND_MM_HEADER_OF(blk) ZEND_MM_BLOCK_AT(blk, -(int)ZEND_MM_ALIGNED_HEADER_SIZE)
1701 +# define ZEND_MM_SET_THREAD_ID(block) \
1702 + ((zend_mm_block_canary*)(block))->thread_id = tsrm_thread_id()
1703 +# define ZEND_MM_BAD_THREAD_ID(block) ((block)->thread_id != tsrm_thread_id())
1705 +# define ZEND_MM_SET_THREAD_ID(block)
1706 +# define ZEND_MM_BAD_THREAD_ID(block) 0
1709 +# define ZEND_MM_VALID_PTR(block) \
1710 + zend_mm_check_ptr(heap, block, 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC)
1712 +# define ZEND_MM_SET_MAGIC(block, val) do { \
1713 + (block)->magic = (val); \
1716 +# define ZEND_MM_CHECK_MAGIC(block, val) do { \
1717 + if ((block)->magic != (val)) { \
1718 + zend_mm_panic("zend_mm_heap corrupted"); \
1722 +# define ZEND_MM_SET_DEBUG_INFO(block, __size, set_valid, set_thread) do { \
1723 + ((zend_mm_block_canary*)(block))->debug.filename = __zend_filename; \
1724 + ((zend_mm_block_canary*)(block))->debug.lineno = __zend_lineno; \
1725 + ((zend_mm_block_canary*)(block))->debug.orig_filename = __zend_orig_filename; \
1726 + ((zend_mm_block_canary*)(block))->debug.orig_lineno = __zend_orig_lineno; \
1727 + ZEND_MM_SET_BLOCK_SIZE(block, __size); \
1728 + if (set_valid) { \
1729 + ZEND_MM_SET_MAGIC(block, MEM_BLOCK_VALID); \
1731 + if (set_thread) { \
1732 + ZEND_MM_SET_THREAD_ID(block); \
1738 +# define ZEND_MM_VALID_PTR(ptr) EXPECTED(ptr != NULL)
1740 +# define ZEND_MM_SET_MAGIC(block, val)
1742 +# define ZEND_MM_CHECK_MAGIC(block, val)
1744 +# define ZEND_MM_SET_DEBUG_INFO(block, __size, set_valid, set_thread) ZEND_MM_SET_BLOCK_SIZE(block, __size)
1748 +#if SUHOSIN_MM_WITH_CANARY_PROTECTION
1750 +# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) do { \
1751 + char *p = SUHOSIN_MM_END_CANARY_PTR(block); size_t check; \
1752 + if (((block)->info.canary_1 != heap->canary_1) || ((block)->info.canary_2 != heap->canary_2)) { \
1753 + canary_mismatch: \
1754 + zend_suhosin_log(S_MEMORY, "canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \
1755 + if (SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) == 0) { _exit(1); } else { (block)->info.canary_1 = heap->canary_1; (block)->info.canary_2 = heap->canary_2; }\
1757 + memcpy(&check, p, CANARY_SIZE); \
1758 + if (check != heap->canary_3) { \
1759 + zend_suhosin_log(S_MEMORY, "end canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \
1760 + if (SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) == 0) { _exit(1); } else { memcpy(p, heap->canary_3, CANARY_SIZE); } \
1764 +# define SUHOSIN_MM_SET_CANARIES(block) do { \
1765 + (block)->info.canary_1 = heap->canary_1; \
1766 + (block)->info.canary_2 = heap->canary_2; \
1769 +# define SUHOSIN_MM_END_CANARY_PTR(block) \
1770 + (char *)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block_canary*)(block))->info.size + END_MAGIC_SIZE)
1772 +# define SUHOSIN_MM_SET_END_CANARY(block) do { \
1773 + char *p = SUHOSIN_MM_END_CANARY_PTR(block); \
1774 + memcpy(p, &heap->canary_3, CANARY_SIZE); \
1779 +# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION)
1780 +# define SUHOSIN_MM_SET_CANARIES(block)
1781 +# define SUHOSIN_MM_END_CANARY_PTR(block)
1782 +# define SUHOSIN_MM_SET_END_CANARY(block)
1787 +#if ZEND_MM_HEAP_PROTECTION
1789 +# define ZEND_MM_CHECK_PROTECTION(block) \
1791 + if ((block)->debug.start_magic != _mem_block_start_magic || \
1792 + memcmp(ZEND_MM_END_MAGIC_PTR(block), &_mem_block_end_magic, END_MAGIC_SIZE) != 0) { \
1793 + zend_mm_panic("zend_mm_heap corrupted"); \
1797 +# define ZEND_MM_END_MAGIC_PTR(block) \
1798 + (((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block_canary*)(block))->debug.size)
1800 +# define END_MAGIC_SIZE sizeof(unsigned int)
1802 +# define ZEND_MM_SET_BLOCK_SIZE(block, __size) do { \
1804 + ((zend_mm_block_canary*)(block))->debug.size = (__size); \
1805 + p = ZEND_MM_END_MAGIC_PTR(block); \
1806 + ((zend_mm_block_canary*)(block))->debug.start_magic = _mem_block_start_magic; \
1807 + memcpy(p, &_mem_block_end_magic, END_MAGIC_SIZE); \
1810 +static unsigned int _mem_block_start_magic = 0;
1811 +static unsigned int _mem_block_end_magic = 0;
1816 +# define ZEND_MM_SET_BLOCK_SIZE(block, _size) \
1817 + ((zend_mm_block_canary*)(block))->debug.size = (_size)
1819 +# define ZEND_MM_SET_BLOCK_SIZE(block, _size)
1822 +# define ZEND_MM_CHECK_PROTECTION(block)
1824 +# define END_MAGIC_SIZE 0
1828 +#if ZEND_MM_SAFE_UNLINKING
1829 +# define ZEND_MM_CHECK_BLOCK_LINKAGE(block) \
1830 + if (UNEXPECTED((block)->info._size != ZEND_MM_BLOCK_AT(block, ZEND_MM_FREE_BLOCK_SIZE(block))->info._prev) || \
1831 + UNEXPECTED(!UNEXPECTED(ZEND_MM_IS_FIRST_BLOCK(block)) && \
1832 + UNEXPECTED(ZEND_MM_PREV_BLOCK(block)->info._size != (block)->info._prev))) { \
1833 + zend_mm_panic("zend_mm_heap corrupted"); \
1835 +#define ZEND_MM_CHECK_TREE(block) \
1836 + if (UNEXPECTED(*((block)->parent) != (block))) { \
1837 + zend_mm_panic("zend_mm_heap corrupted"); \
1840 +# define ZEND_MM_CHECK_BLOCK_LINKAGE(block)
1841 +# define ZEND_MM_CHECK_TREE(block)
1844 +#define ZEND_MM_LARGE_BUCKET_INDEX(S) zend_mm_high_bit(S)
1846 +void *_zend_mm_alloc_canary_int(zend_mm_heap_canary *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC;
1847 +void _zend_mm_free_canary_int(zend_mm_heap_canary *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
1848 +void *_zend_mm_realloc_canary_int(zend_mm_heap_canary *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
1851 +static inline unsigned int zend_mm_high_bit(size_t _size)
1853 +#if defined(__GNUC__) && defined(i386)
1856 + __asm__("bsrl %1,%0\n\t" : "=r" (n) : "rm" (_size));
1858 +#elif defined(__GNUC__) && defined(__x86_64__)
1861 + __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size));
1862 + return (unsigned int)n;
1863 +#elif defined(_MSC_VER) && defined(_M_IX86)
1868 + unsigned int n = 0;
1869 + while (_size != 0) {
1870 + _size = _size >> 1;
1877 +static inline unsigned int zend_mm_low_bit(size_t _size)
1879 +#if defined(__GNUC__) && defined(i386)
1882 + __asm__("bsfl %1,%0\n\t" : "=r" (n) : "rm" (_size));
1884 +#elif defined(__GNUC__) && defined(__x86_64__)
1887 + __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size));
1888 + return (unsigned int)n;
1889 +#elif defined(_MSC_VER) && defined(_M_IX86)
1894 + static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
1896 + unsigned int index = 0;
1898 + n = offset[_size & 15];
1902 + n = offset[_size & 15];
1909 +static void zend_mm_add_to_rest_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block)
1911 + zend_mm_free_block_canary *prev, *next;
1913 + ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_FREED);
1915 + if (!ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block))) {
1916 + mm_block->parent = NULL;
1919 + prev = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]);
1920 + next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
1921 + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
1922 + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
1923 + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
1926 +static void zend_mm_add_to_free_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block)
1931 + ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_FREED);
1933 + size = ZEND_MM_FREE_BLOCK_SIZE(mm_block);
1934 + if (EXPECTED(!ZEND_MM_SMALL_SIZE(size))) {
1935 + zend_mm_free_block_canary **p;
1937 + index = ZEND_MM_LARGE_BUCKET_INDEX(size);
1938 + p = &heap->large_free_buckets[index];
1939 + mm_block->child[0] = mm_block->child[1] = NULL;
1942 + mm_block->parent = p;
1943 + mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block);
1944 + heap->large_free_bitmap |= (ZEND_MM_LONG_CONST(1) << index);
1948 + for (m = size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) {
1949 + zend_mm_free_block_canary *prev = *p;
1951 + if (ZEND_MM_FREE_BLOCK_SIZE(prev) != size) {
1952 + p = &prev->child[(m >> (ZEND_MM_NUM_BUCKETS-1)) & 1];
1955 + mm_block->parent = p;
1956 + mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block);
1960 + zend_mm_free_block_canary *next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
1962 + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
1963 + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
1964 + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
1965 + mm_block->parent = NULL;
1971 + zend_mm_free_block_canary *prev, *next;
1973 + index = ZEND_MM_BUCKET_INDEX(size);
1975 + prev = ZEND_MM_SMALL_FREE_BUCKET(heap, index);
1976 + if (SUHOSIN_MANGLE_PTR(prev->prev_free_block) == prev) {
1977 + heap->free_bitmap |= (ZEND_MM_LONG_CONST(1) << index);
1979 + next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
1981 + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
1982 + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
1983 + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
1987 +static void zend_mm_remove_from_free_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block)
1989 + zend_mm_free_block_canary *prev = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block);
1990 + zend_mm_free_block_canary *next = SUHOSIN_MANGLE_PTR(mm_block->next_free_block);
1992 + ZEND_MM_CHECK_MAGIC(mm_block, MEM_BLOCK_FREED);
1994 + if (EXPECTED(prev == mm_block)) {
1995 + zend_mm_free_block_canary **rp, **cp;
1998 + if (next != mm_block) {
1999 + zend_suhosin_log(S_MEMORY, "zend_mm_heap corrupted at %p", mm_block);
2003 +#if ZEND_MM_SAFE_UNLINKING
2004 + if (UNEXPECTED(next != mm_block)) {
2005 + zend_mm_panic("zend_mm_heap corrupted");
2009 + rp = &mm_block->child[mm_block->child[1] != NULL];
2011 + if (EXPECTED(prev == NULL)) {
2012 + size_t index = ZEND_MM_LARGE_BUCKET_INDEX(ZEND_MM_FREE_BLOCK_SIZE(mm_block));
2014 + ZEND_MM_CHECK_TREE(mm_block);
2015 + *mm_block->parent = NULL;
2016 + if (mm_block->parent == &heap->large_free_buckets[index]) {
2017 + heap->large_free_bitmap &= ~(ZEND_MM_LONG_CONST(1) << index);
2020 + while (*(cp = &(prev->child[prev->child[1] != NULL])) != NULL) {
2027 + ZEND_MM_CHECK_TREE(mm_block);
2028 + *mm_block->parent = prev;
2029 + prev->parent = mm_block->parent;
2030 + if ((prev->child[0] = mm_block->child[0])) {
2031 + ZEND_MM_CHECK_TREE(prev->child[0]);
2032 + prev->child[0]->parent = &prev->child[0];
2034 + if ((prev->child[1] = mm_block->child[1])) {
2035 + ZEND_MM_CHECK_TREE(prev->child[1]);
2036 + prev->child[1]->parent = &prev->child[1];
2042 + if (SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block || SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block) {
2043 + zend_suhosin_log(S_MEMORY, "zend_mm_head corrupted at %p", mm_block);
2048 +#if ZEND_MM_SAFE_UNLINKING
2049 + if (UNEXPECTED(SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block) || UNEXPECTED(SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block)) {
2050 + zend_mm_panic("zend_mm_heap corrupted");
2054 + prev->next_free_block = SUHOSIN_MANGLE_PTR(next);
2055 + next->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
2057 + if (EXPECTED(ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block)))) {
2058 + if (EXPECTED(prev == next)) {
2059 + size_t index = ZEND_MM_BUCKET_INDEX(ZEND_MM_FREE_BLOCK_SIZE(mm_block));
2061 + if (EXPECTED(heap->free_buckets[index*2] == heap->free_buckets[index*2+1])) {
2062 + heap->free_bitmap &= ~(ZEND_MM_LONG_CONST(1) << index);
2065 + } else if (UNEXPECTED(mm_block->parent != NULL)) {
2071 +static void zend_mm_init(zend_mm_heap_canary *heap)
2073 + zend_mm_free_block_canary* p;
2076 + heap->free_bitmap = 0;
2077 + heap->large_free_bitmap = 0;
2080 + memset(heap->cache, 0, sizeof(heap->cache));
2082 +#if ZEND_MM_CACHE_STAT
2083 + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
2084 + heap->cache_stat[i].count = 0;
2087 + p = ZEND_MM_SMALL_FREE_BUCKET(heap, 0);
2088 + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
2089 + p->next_free_block = SUHOSIN_MANGLE_PTR(p);
2090 + p->prev_free_block = SUHOSIN_MANGLE_PTR(p);
2091 + p = (zend_mm_free_block_canary*)((char*)p + sizeof(zend_mm_free_block_canary*) * 2);
2092 + heap->large_free_buckets[i] = NULL;
2094 + heap->rest_buckets[0] = heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(heap));
2096 + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) {
2097 + zend_canary(&heap->canary_1, sizeof(heap->canary_1));
2098 + zend_canary(&heap->canary_2, sizeof(heap->canary_2));
2099 + zend_canary(&heap->canary_3, sizeof(heap->canary_3));
2104 +static void zend_mm_del_segment(zend_mm_heap_canary *heap, zend_mm_segment *segment)
2106 + zend_mm_segment **p = &heap->segments_list;
2108 + while (*p != segment) {
2109 + p = &(*p)->next_segment;
2111 + *p = segment->next_segment;
2112 + heap->real_size -= segment->size;
2113 + ZEND_MM_STORAGE_FREE(segment);
2117 +static void zend_mm_free_cache(zend_mm_heap_canary *heap)
2121 + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
2122 + /* SUHOSIN_MANGLE_PTR should NOT affect NULL pointers */
2123 + if (heap->cache[i]) {
2124 + zend_mm_free_block_canary *mm_block = SUHOSIN_MANGLE_PTR(heap->cache[i]);
2126 + while (mm_block) {
2127 + size_t size = ZEND_MM_BLOCK_SIZE(mm_block);
2128 + zend_mm_free_block_canary *q = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block);
2129 + zend_mm_block_canary *next_block = ZEND_MM_NEXT_BLOCK(mm_block);
2131 + heap->cached -= size;
2133 + if (ZEND_MM_PREV_BLOCK_IS_FREE(mm_block)) {
2134 + mm_block = (zend_mm_free_block_canary*)ZEND_MM_PREV_BLOCK(mm_block);
2135 + size += ZEND_MM_FREE_BLOCK_SIZE(mm_block);
2136 + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) mm_block);
2138 + if (ZEND_MM_IS_FREE_BLOCK(next_block)) {
2139 + size += ZEND_MM_FREE_BLOCK_SIZE(next_block);
2140 + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block);
2142 + ZEND_MM_BLOCK(mm_block, ZEND_MM_FREE_BLOCK, size);
2144 + if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
2145 + ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_NEXT_BLOCK(mm_block))) {
2146 + zend_mm_del_segment(heap, (zend_mm_segment *) ((char *)mm_block - ZEND_MM_ALIGNED_SEGMENT_SIZE));
2148 + zend_mm_add_to_free_list(heap, (zend_mm_free_block_canary *) mm_block);
2153 + heap->cache[i] = NULL;
2154 +#if ZEND_MM_CACHE_STAT
2155 + heap->cache_stat[i].count = 0;
2162 +#if ZEND_MM_HEAP_PROTECTION || ZEND_MM_COOKIES
2163 +static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */
2169 + HCRYPTPROV hCryptProv;
2170 + int has_context = 0;
2172 + if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
2173 + /* Could mean that the key container does not exist, let try
2174 + again by asking for a new one */
2175 + if (GetLastError() == NTE_BAD_KEYSET) {
2176 + if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
2183 + if (has_context) {
2185 + BOOL ret = CryptGenRandom(hCryptProv, size, buf);
2186 + CryptReleaseContext(hCryptProv, 0);
2188 + while (i < size && buf[i] != 0) {
2197 +#elif defined(HAVE_DEV_URANDOM)
2198 + int fd = open("/dev/urandom", 0);
2201 + if (read(fd, buf, size) == size) {
2202 + while (i < size && buf[i] != 0) {
2213 + t = (unsigned char)getpid();
2214 + while (i < size) {
2216 + buf[i] = ((unsigned char)rand()) ^ t;
2217 + } while (buf[i] == 0);
2218 + t = buf[i++] << 1;
2226 + * - This function may alter the block_sizes values to match platform alignment
2227 + * - This function does *not* perform sanity checks on the arguments
2229 +zend_mm_heap_canary *__zend_mm_startup_canary_ex(const zend_mm_mem_handlers *handlers, size_t block_size, size_t reserve_size, int internal, void *params)
2231 + zend_mm_storage *storage;
2232 + zend_mm_heap_canary *heap;
2233 + zend_mm_free_block_canary *tmp;
2238 + printf("ZEND_MM_ALIGNMENT=%d\n", ZEND_MM_ALIGNMENT);
2239 + printf("ZEND_MM_ALIGNMENT_LOG2=%d\n", ZEND_MM_ALIGNMENT_LOG2);
2240 + printf("ZEND_MM_MIN_SIZE=%d\n", ZEND_MM_MIN_SIZE);
2241 + printf("ZEND_MM_MAX_SMALL_SIZE=%d\n", ZEND_MM_MAX_SMALL_SIZE);
2242 + printf("ZEND_MM_ALIGNED_HEADER_SIZE=%d\n", ZEND_MM_ALIGNED_HEADER_SIZE);
2243 + printf("ZEND_MM_ALIGNED_FREE_HEADER_SIZE=%d\n", ZEND_MM_ALIGNED_FREE_HEADER_SIZE);
2244 + printf("ZEND_MM_MIN_ALLOC_BLOCK_SIZE=%d\n", ZEND_MM_MIN_ALLOC_BLOCK_SIZE);
2245 + printf("ZEND_MM_ALIGNED_MIN_HEADER_SIZE=%d\n", ZEND_MM_ALIGNED_MIN_HEADER_SIZE);
2246 + printf("ZEND_MM_ALIGNED_SEGMENT_SIZE=%d\n", ZEND_MM_ALIGNED_SEGMENT_SIZE);
2247 + for (i = 0; i < ZEND_MM_MAX_SMALL_SIZE; i++) {
2248 + printf("%3d%c: %3ld %d %2ld\n", i, (i == ZEND_MM_MIN_SIZE?'*':' '), (long)ZEND_MM_TRUE_SIZE(i), ZEND_MM_SMALL_SIZE(ZEND_MM_TRUE_SIZE(i)), (long)ZEND_MM_BUCKET_INDEX(ZEND_MM_TRUE_SIZE(i)));
2253 +#if ZEND_MM_HEAP_PROTECTION
2254 + if (_mem_block_start_magic == 0) {
2255 + zend_mm_random((unsigned char*)&_mem_block_start_magic, sizeof(_mem_block_start_magic));
2257 + if (_mem_block_end_magic == 0) {
2258 + zend_mm_random((unsigned char*)&_mem_block_end_magic, sizeof(_mem_block_end_magic));
2261 +#if ZEND_MM_COOKIES
2262 + if (_zend_mm_cookie == 0) {
2263 + zend_mm_random((unsigned char*)&_zend_mm_cookie, sizeof(_zend_mm_cookie));
2267 + /* get the pointer guardian and ensure low 3 bits are 1 */
2268 + if (SUHOSIN_POINTER_GUARD == 0) {
2269 + zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD));
2270 + SUHOSIN_POINTER_GUARD |= 7;
2273 + if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) {
2274 + fprintf(stderr, "'block_size' must be a power of two\n");
2275 +/* See http://support.microsoft.com/kb/190351 */
2281 + storage = handlers->init(params);
2283 + fprintf(stderr, "Cannot initialize zend_mm storage [%s]\n", handlers->name);
2284 +/* See http://support.microsoft.com/kb/190351 */
2290 + storage->handlers = handlers;
2292 + heap = malloc(sizeof(struct _zend_mm_heap_canary));
2294 + heap->storage = storage;
2295 + heap->block_size = block_size;
2296 + heap->compact_size = 0;
2297 + heap->segments_list = NULL;
2298 + zend_mm_init(heap);
2299 +# if ZEND_MM_CACHE_STAT
2300 + memset(heap->cache_stat, 0, sizeof(heap->cache_stat));
2303 + heap->use_zend_alloc = 1;
2304 + heap->real_size = 0;
2305 + heap->overflow = 0;
2306 + heap->real_peak = 0;
2307 + heap->limit = ZEND_MM_LONG_CONST(1)<<(ZEND_MM_NUM_BUCKETS-2);
2310 + heap->internal = internal;
2311 + heap->reserve = NULL;
2312 + heap->reserve_size = reserve_size;
2313 + if (reserve_size > 0) {
2314 + heap->reserve = _zend_mm_alloc((zend_mm_heap *)heap, reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
2318 + zend_mm_free_block_canary *p, *q, *orig;
2319 + zend_mm_heap_canary *mm_heap = _zend_mm_alloc((zend_mm_heap *)heap, sizeof(zend_mm_heap_canary) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
2323 + p = ZEND_MM_SMALL_FREE_BUCKET(mm_heap, 0);
2324 + orig = ZEND_MM_SMALL_FREE_BUCKET(heap, 0);
2325 + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
2327 + while (SUHOSIN_MANGLE_PTR(q->prev_free_block) != orig) {
2328 + q = SUHOSIN_MANGLE_PTR(q->prev_free_block);
2330 + q->prev_free_block = SUHOSIN_MANGLE_PTR(p);
2332 + while (SUHOSIN_MANGLE_PTR(q->next_free_block) != orig) {
2333 + q = SUHOSIN_MANGLE_PTR(q->next_free_block);
2335 + q->next_free_block = SUHOSIN_MANGLE_PTR(p);
2336 + p = (zend_mm_free_block_canary*)((char*)p + sizeof(zend_mm_free_block_canary*) * 2);
2337 + orig = (zend_mm_free_block_canary*)((char*)orig + sizeof(zend_mm_free_block_canary*) * 2);
2338 + if (mm_heap->large_free_buckets[i]) {
2339 + mm_heap->large_free_buckets[i]->parent = &mm_heap->large_free_buckets[i];
2342 + mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(mm_heap));
2350 +zend_mm_heap_canary *__zend_mm_startup_canary(void)
2354 + char *mem_type = getenv("ZEND_MM_MEM_TYPE");
2356 + const zend_mm_mem_handlers *handlers;
2357 + zend_mm_heap_canary *heap;
2359 + if (mem_type == NULL) {
2362 + for (i = 0; mem_handlers[i].name; i++) {
2363 + if (strcmp(mem_handlers[i].name, mem_type) == 0) {
2367 + if (!mem_handlers[i].name) {
2368 + fprintf(stderr, "Wrong or unsupported zend_mm storage type '%s'\n", mem_type);
2369 + fprintf(stderr, " supported types:\n");
2370 +/* See http://support.microsoft.com/kb/190351 */
2374 + for (i = 0; mem_handlers[i].name; i++) {
2375 + fprintf(stderr, " '%s'\n", mem_handlers[i].name);
2377 +/* See http://support.microsoft.com/kb/190351 */
2384 + handlers = &mem_handlers[i];
2386 + tmp = getenv("ZEND_MM_SEG_SIZE");
2388 + seg_size = zend_atoi(tmp, 0);
2389 + if (zend_mm_low_bit(seg_size) != zend_mm_high_bit(seg_size)) {
2390 + fprintf(stderr, "ZEND_MM_SEG_SIZE must be a power of two\n");
2391 +/* See http://support.microsoft.com/kb/190351 */
2396 + } else if (seg_size < ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE) {
2397 + fprintf(stderr, "ZEND_MM_SEG_SIZE is too small\n");
2398 +/* See http://support.microsoft.com/kb/190351 */
2405 + seg_size = ZEND_MM_SEG_SIZE;
2408 + heap = __zend_mm_startup_canary_ex(handlers, seg_size, ZEND_MM_RESERVE_SIZE, 0, NULL);
2410 + tmp = getenv("ZEND_MM_COMPACT");
2412 + heap->compact_size = zend_atoi(tmp, 0);
2414 + heap->compact_size = 2 * 1024 * 1024;
2421 +static long zend_mm_find_leaks(zend_mm_segment *segment, zend_mm_block_canary *b)
2424 + zend_mm_block_canary *p, *q;
2426 + p = ZEND_MM_NEXT_BLOCK(b);
2428 + if (ZEND_MM_IS_GUARD_BLOCK(p)) {
2429 + ZEND_MM_CHECK_MAGIC(p, MEM_BLOCK_GUARD);
2430 + segment = segment->next_segment;
2434 + p = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE);
2437 + q = ZEND_MM_NEXT_BLOCK(p);
2439 + (char*)q > (char*)segment + segment->size ||
2440 + p->info._size != q->info._prev) {
2441 + zend_mm_panic("zend_mm_heap corrupted");
2443 + if (!ZEND_MM_IS_FREE_BLOCK(p)) {
2444 + if (p->magic == MEM_BLOCK_VALID) {
2445 + if (p->debug.filename==b->debug.filename && p->debug.lineno==b->debug.lineno) {
2446 + ZEND_MM_SET_MAGIC(p, MEM_BLOCK_LEAK);
2450 + } else if (p->magic == MEM_BLOCK_CACHED) {
2453 + } else if (p->magic != MEM_BLOCK_LEAK) {
2454 + zend_mm_panic("zend_mm_heap corrupted");
2462 +static void zend_mm_check_leaks(zend_mm_heap_canary *heap TSRMLS_DC)
2464 + zend_mm_segment *segment = heap->segments_list;
2465 + zend_mm_block_canary *p, *q;
2466 + zend_uint total = 0;
2471 + p = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE);
2473 + q = ZEND_MM_NEXT_BLOCK(p);
2475 + (char*)q > (char*)segment + segment->size ||
2476 + p->info._size != q->info._prev) {
2477 + zend_mm_panic("zend_mm_heap corrupted");
2479 + if (!ZEND_MM_IS_FREE_BLOCK(p)) {
2480 + if (p->magic == MEM_BLOCK_VALID) {
2482 + zend_leak_info leak;
2484 + ZEND_MM_SET_MAGIC(p, MEM_BLOCK_LEAK);
2486 + leak.addr = ZEND_MM_DATA_OF(p);
2487 + leak.size = p->debug.size;
2488 + leak.filename = p->debug.filename;
2489 + leak.lineno = p->debug.lineno;
2490 + leak.orig_filename = p->debug.orig_filename;
2491 + leak.orig_lineno = p->debug.orig_lineno;
2493 + zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC);
2494 + zend_message_dispatcher(ZMSG_MEMORY_LEAK_DETECTED, &leak TSRMLS_CC);
2495 + repeated = zend_mm_find_leaks(segment, p);
2496 + total += 1 + repeated;
2498 + zend_message_dispatcher(ZMSG_MEMORY_LEAK_REPEATED, (void *)(zend_uintptr_t)repeated TSRMLS_CC);
2501 + } else if (p->magic == MEM_BLOCK_CACHED) {
2504 + } else if (p->magic != MEM_BLOCK_LEAK) {
2505 + zend_mm_panic("zend_mm_heap corrupted");
2508 + if (ZEND_MM_IS_GUARD_BLOCK(q)) {
2509 + segment = segment->next_segment;
2513 + q = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE);
2518 + zend_message_dispatcher(ZMSG_MEMORY_LEAKS_GRAND_TOTAL, &total TSRMLS_CC);
2522 +static int zend_mm_check_ptr(zend_mm_heap_canary *heap, void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
2524 + zend_mm_block_canary *p;
2525 + int no_cache_notice = 0;
2526 + int had_problems = 0;
2527 + int valid_beginning = 1;
2531 + no_cache_notice = 1;
2532 + } else if (silent==3) {
2534 + no_cache_notice = 1;
2539 + zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC);
2540 + zend_debug_alloc_output("---------------------------------------\n");
2541 + zend_debug_alloc_output("%s(%d) : Block "PTR_FMT" status:\n" ZEND_FILE_LINE_RELAY_CC, ptr);
2542 + if (__zend_orig_filename) {
2543 + zend_debug_alloc_output("%s(%d) : Actual location (location was relayed)\n" ZEND_FILE_LINE_ORIG_RELAY_CC);
2546 + zend_debug_alloc_output("NULL\n");
2547 + zend_debug_alloc_output("---------------------------------------\n");
2554 + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2558 + p = ZEND_MM_HEADER_OF(ptr);
2561 + if (ZEND_MM_BAD_THREAD_ID(p)) {
2563 + zend_debug_alloc_output("Invalid pointer: ((thread_id=0x%0.8X) != (expected=0x%0.8X))\n", (long)p->thread_id, (long)tsrm_thread_id());
2566 + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2571 + if (p->info._size != ZEND_MM_NEXT_BLOCK(p)->info._prev) {
2573 + zend_debug_alloc_output("Invalid pointer: ((size="PTR_FMT") != (next.prev="PTR_FMT"))\n", p->info._size, ZEND_MM_NEXT_BLOCK(p)->info._prev);
2576 + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2579 + if (p->info._prev != ZEND_MM_GUARD_BLOCK &&
2580 + ZEND_MM_PREV_BLOCK(p)->info._size != p->info._prev) {
2582 + zend_debug_alloc_output("Invalid pointer: ((prev="PTR_FMT") != (prev.size="PTR_FMT"))\n", p->info._prev, ZEND_MM_PREV_BLOCK(p)->info._size);
2585 + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2589 + if (had_problems) {
2590 + zend_debug_alloc_output("---------------------------------------\n");
2595 + zend_debug_alloc_output("%10s\t","Beginning: ");
2598 + if (!ZEND_MM_IS_USED_BLOCK(p)) {
2600 + if (p->magic != MEM_BLOCK_FREED) {
2601 + zend_debug_alloc_output("Freed (magic=0x%0.8X, expected=0x%0.8X)\n", p->magic, MEM_BLOCK_FREED);
2603 + zend_debug_alloc_output("Freed\n");
2607 + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2609 + } else if (ZEND_MM_IS_GUARD_BLOCK(p)) {
2611 + if (p->magic != MEM_BLOCK_FREED) {
2612 + zend_debug_alloc_output("Guard (magic=0x%0.8X, expected=0x%0.8X)\n", p->magic, MEM_BLOCK_FREED);
2614 + zend_debug_alloc_output("Guard\n");
2618 + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2621 + switch (p->magic) {
2622 + case MEM_BLOCK_VALID:
2623 + case MEM_BLOCK_LEAK:
2625 + zend_debug_alloc_output("OK (allocated on %s:%d, %d bytes)\n", p->debug.filename, p->debug.lineno, (int)p->debug.size);
2628 + case MEM_BLOCK_CACHED:
2629 + if (!no_cache_notice) {
2631 + zend_debug_alloc_output("Cached\n");
2634 + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2637 + case MEM_BLOCK_FREED:
2639 + zend_debug_alloc_output("Freed (invalid)\n");
2642 + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2645 + case MEM_BLOCK_GUARD:
2647 + zend_debug_alloc_output("Guard (invalid)\n");
2650 + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2655 + zend_debug_alloc_output("Unknown (magic=0x%0.8X, expected=0x%0.8X)\n", p->magic, MEM_BLOCK_VALID);
2657 + valid_beginning = 0;
2659 + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2665 +#if ZEND_MM_HEAP_PROTECTION
2666 + if (!valid_beginning) {
2668 + zend_debug_alloc_output("%10s\t", "Start:");
2669 + zend_debug_alloc_output("Unknown\n");
2670 + zend_debug_alloc_output("%10s\t", "End:");
2671 + zend_debug_alloc_output("Unknown\n");
2674 + char *end_magic = ZEND_MM_END_MAGIC_PTR(p);
2676 + if (p->debug.start_magic == _mem_block_start_magic) {
2678 + zend_debug_alloc_output("%10s\t", "Start:");
2679 + zend_debug_alloc_output("OK\n");
2682 + char *overflow_ptr, *magic_ptr=(char *) &_mem_block_start_magic;
2687 + return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2690 + overflow_ptr = (char *) &p->debug.start_magic;
2691 + i = END_MAGIC_SIZE;
2692 + while (--i >= 0) {
2693 + if (overflow_ptr[i]!=magic_ptr[i]) {
2697 + zend_debug_alloc_output("%10s\t", "Start:");
2698 + zend_debug_alloc_output("Overflown (magic=0x%0.8X instead of 0x%0.8X)\n", p->debug.start_magic, _mem_block_start_magic);
2699 + zend_debug_alloc_output("%10s\t","");
2700 + if (overflows >= END_MAGIC_SIZE) {
2701 + zend_debug_alloc_output("At least %d bytes overflown\n", END_MAGIC_SIZE);
2703 + zend_debug_alloc_output("%d byte(s) overflown\n", overflows);
2706 + if (memcmp(end_magic, &_mem_block_end_magic, END_MAGIC_SIZE)==0) {
2708 + zend_debug_alloc_output("%10s\t", "End:");
2709 + zend_debug_alloc_output("OK\n");
2712 + char *overflow_ptr, *magic_ptr=(char *) &_mem_block_end_magic;
2717 + return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
2720 + overflow_ptr = (char *) end_magic;
2722 + for (i=0; i < END_MAGIC_SIZE; i++) {
2723 + if (overflow_ptr[i]!=magic_ptr[i]) {
2728 + zend_debug_alloc_output("%10s\t", "End:");
2729 + zend_debug_alloc_output("Overflown (magic=0x%0.8X instead of 0x%0.8X)\n", *end_magic, _mem_block_end_magic);
2730 + zend_debug_alloc_output("%10s\t","");
2731 + if (overflows >= END_MAGIC_SIZE) {
2732 + zend_debug_alloc_output("At least %d bytes overflown\n", END_MAGIC_SIZE);
2734 + zend_debug_alloc_output("%d byte(s) overflown\n", overflows);
2741 + zend_debug_alloc_output("---------------------------------------\n");
2743 + return ((!had_problems) ? 1 : 0);
2746 +static int zend_mm_check_heap(zend_mm_heap_canary *heap, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
2748 + zend_mm_segment *segment = heap->segments_list;
2749 + zend_mm_block_canary *p, *q;
2755 + p = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE);
2757 + q = ZEND_MM_NEXT_BLOCK(p);
2759 + (char*)q > (char*)segment + segment->size ||
2760 + p->info._size != q->info._prev) {
2761 + zend_mm_panic("zend_mm_heap corrupted");
2763 + if (!ZEND_MM_IS_FREE_BLOCK(p)) {
2764 + if (p->magic == MEM_BLOCK_VALID || p->magic == MEM_BLOCK_LEAK) {
2765 + if (!zend_mm_check_ptr(heap, ZEND_MM_DATA_OF(p), (silent?2:3) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC)) {
2769 + } else if (p->magic == MEM_BLOCK_CACHED) {
2772 + } else if (p->magic != MEM_BLOCK_LEAK) {
2773 + zend_mm_panic("zend_mm_heap corrupted");
2776 + if (ZEND_MM_IS_GUARD_BLOCK(q)) {
2777 + segment = segment->next_segment;
2781 + q = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE);
2788 +void __zend_mm_shutdown_canary(zend_mm_heap_canary *heap, int full_shutdown, int silent TSRMLS_DC)
2790 + zend_mm_storage *storage;
2791 + zend_mm_segment *segment;
2792 + zend_mm_segment *prev;
2795 + if (heap->reserve) {
2798 + _zend_mm_free(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
2801 + heap->reserve = NULL;
2804 +#if ZEND_MM_CACHE_STAT
2805 + if (full_shutdown) {
2808 + f = fopen("zend_mm.log", "w");
2811 + size_t size, true_size, min_size, max_size;
2812 + int hit = 0, miss = 0;
2814 + fprintf(f, "\nidx min_size max_size true_size max_len hits misses\n");
2817 + true_size = ZEND_MM_TRUE_SIZE(size);
2818 + if (ZEND_MM_SMALL_SIZE(true_size)) {
2820 + i = ZEND_MM_BUCKET_INDEX(true_size);
2823 + true_size = ZEND_MM_TRUE_SIZE(size);
2824 + if (ZEND_MM_SMALL_SIZE(true_size)) {
2825 + j = ZEND_MM_BUCKET_INDEX(true_size);
2827 + max_size = size-1;
2831 + max_size = size-1;
2836 + hit += heap->cache_stat[i].hit;
2837 + miss += heap->cache_stat[i].miss;
2838 + fprintf(f, "%2d %8d %8d %9d %8d %8d %8d\n", i, (int)min_size, (int)max_size, ZEND_MM_TRUE_SIZE(max_size), heap->cache_stat[i].max_count, heap->cache_stat[i].hit, heap->cache_stat[i].miss);
2843 + fprintf(f, " %8d %8d\n", hit, miss);
2844 + fprintf(f, " %8d %8d\n", heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit, heap->cache_stat[ZEND_MM_NUM_BUCKETS].miss);
2852 + zend_mm_check_leaks(heap TSRMLS_CC);
2856 + internal = heap->internal;
2857 + storage = heap->storage;
2858 + segment = heap->segments_list;
2861 + segment = segment->next_segment;
2862 + ZEND_MM_STORAGE_FREE(prev);
2864 + if (full_shutdown) {
2865 + storage->handlers->dtor(storage);
2870 + if (heap->compact_size &&
2871 + heap->real_peak > heap->compact_size) {
2872 + storage->handlers->compact(storage);
2874 + heap->segments_list = NULL;
2875 + zend_mm_init(heap);
2876 + heap->real_size = 0;
2877 + heap->real_peak = 0;
2880 + if (heap->reserve_size) {
2881 + heap->reserve = _zend_mm_alloc((zend_mm_heap *)heap, heap->reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
2883 + heap->overflow = 0;
2887 +static void zend_mm_safe_error(zend_mm_heap_canary *heap,
2888 + const char *format,
2891 + const char *filename,
2896 + if (heap->reserve) {
2897 + _zend_mm_free_canary_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC);
2898 + heap->reserve = NULL;
2900 + if (heap->overflow == 0) {
2901 + char *error_filename;
2902 + uint error_lineno;
2904 + if (zend_is_compiling(TSRMLS_C)) {
2905 + error_filename = zend_get_compiled_filename(TSRMLS_C);
2906 + error_lineno = zend_get_compiled_lineno(TSRMLS_C);
2907 + } else if (EG(in_execution)) {
2908 + error_filename = EG(active_op_array)?EG(active_op_array)->filename:NULL;
2909 + error_lineno = EG(opline_ptr)?(*EG(opline_ptr))->lineno:0;
2911 + error_filename = NULL;
2914 + if (!error_filename) {
2915 + error_filename = "Unknown";
2917 + heap->overflow = 1;
2919 + zend_error_noreturn(E_ERROR,
2928 + if (heap->overflow == 2) {
2929 + fprintf(stderr, "\nFatal error: ");
2938 + fprintf(stderr, " in %s on line %d\n", error_filename, error_lineno);
2940 +/* See http://support.microsoft.com/kb/190351 */
2946 + heap->overflow = 2;
2951 +static zend_mm_free_block_canary *zend_mm_search_large_block(zend_mm_heap_canary *heap, size_t true_size)
2953 + zend_mm_free_block_canary *best_fit;
2954 + size_t index = ZEND_MM_LARGE_BUCKET_INDEX(true_size);
2955 + size_t bitmap = heap->large_free_bitmap >> index;
2956 + zend_mm_free_block_canary *p;
2958 + if (bitmap == 0) {
2962 + if (UNEXPECTED((bitmap & 1) != 0)) {
2963 + /* Search for best "large" free block */
2964 + zend_mm_free_block_canary *rst = NULL;
2966 + size_t best_size = -1;
2969 + p = heap->large_free_buckets[index];
2970 + for (m = true_size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) {
2971 + if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
2972 + return SUHOSIN_MANGLE_PTR(p->next_free_block);
2973 + } else if (ZEND_MM_FREE_BLOCK_SIZE(p) >= true_size &&
2974 + ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
2975 + best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
2978 + if ((m & (ZEND_MM_LONG_CONST(1) << (ZEND_MM_NUM_BUCKETS-1))) == 0) {
2979 + if (p->child[1]) {
2980 + rst = p->child[1];
2982 + if (p->child[0]) {
2987 + } else if (p->child[1]) {
2994 + for (p = rst; p; p = p->child[p->child[0] != NULL]) {
2995 + if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
2996 + return SUHOSIN_MANGLE_PTR(p->next_free_block);
2997 + } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size &&
2998 + ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
2999 + best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
3005 + return SUHOSIN_MANGLE_PTR(best_fit->next_free_block);
3007 + bitmap = bitmap >> 1;
3014 + /* Search for smallest "large" free block */
3015 + best_fit = p = heap->large_free_buckets[index + zend_mm_low_bit(bitmap)];
3016 + while ((p = p->child[p->child[0] != NULL])) {
3017 + if (ZEND_MM_FREE_BLOCK_SIZE(p) < ZEND_MM_FREE_BLOCK_SIZE(best_fit)) {
3021 + return SUHOSIN_MANGLE_PTR(best_fit->next_free_block);
3024 +void *_zend_mm_alloc_canary_int(zend_mm_heap_canary *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
3026 + zend_mm_free_block_canary *best_fit;
3027 + size_t true_size = ZEND_MM_TRUE_SIZE(size);
3028 + size_t block_size;
3029 + size_t remaining_size;
3030 + size_t segment_size;
3031 + zend_mm_segment *segment;
3032 + int keep_rest = 0;
3034 + if (EXPECTED(ZEND_MM_SMALL_SIZE(true_size))) {
3035 + size_t index = ZEND_MM_BUCKET_INDEX(true_size);
3038 + if (UNEXPECTED(true_size < size)) {
3039 + goto out_of_memory;
3042 + if (EXPECTED(heap->cache[index] != NULL)) {
3043 + /* Get block from cache */
3044 +#if ZEND_MM_CACHE_STAT
3045 + heap->cache_stat[index].count--;
3046 + heap->cache_stat[index].hit++;
3048 + best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]);
3049 + heap->cache[index] = best_fit->prev_free_block;
3050 + heap->cached -= true_size;
3052 + SUHOSIN_MM_SET_CANARIES(best_fit);
3053 + ((zend_mm_block_canary*)best_fit)->info.size = size;
3054 + SUHOSIN_MM_SET_END_CANARY(best_fit);
3056 + ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
3057 + ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
3058 + return ZEND_MM_DATA_OF(best_fit);
3060 +#if ZEND_MM_CACHE_STAT
3061 + heap->cache_stat[index].miss++;
3065 + bitmap = heap->free_bitmap >> index;
3067 + /* Found some "small" free block that can be used */
3068 + index += zend_mm_low_bit(bitmap);
3069 + best_fit = SUHOSIN_MANGLE_PTR(heap->free_buckets[index*2]);
3070 +#if ZEND_MM_CACHE_STAT
3071 + heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit++;
3073 + goto zend_mm_finished_searching_for_block;
3077 +#if ZEND_MM_CACHE_STAT
3078 + heap->cache_stat[ZEND_MM_NUM_BUCKETS].miss++;
3081 + best_fit = zend_mm_search_large_block(heap, true_size);
3083 + if (!best_fit && heap->real_size >= heap->limit - heap->block_size) {
3084 + zend_mm_free_block_canary *p = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]);
3085 + size_t best_size = -1;
3087 + while (p != ZEND_MM_REST_BUCKET(heap)) {
3088 + if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
3090 + goto zend_mm_finished_searching_for_block;
3091 + } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size &&
3092 + ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
3093 + best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
3096 + p = SUHOSIN_MANGLE_PTR(p->prev_free_block);
3101 + if (true_size > heap->block_size - (ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE)) {
3102 + /* Make sure we add a memory block which is big enough,
3103 + segment must have header "size" and trailer "guard" block */
3104 + segment_size = true_size + ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE;
3105 + segment_size = (segment_size + (heap->block_size-1)) & ~(heap->block_size-1);
3108 + segment_size = heap->block_size;
3111 + HANDLE_BLOCK_INTERRUPTIONS();
3113 + if (segment_size < true_size ||
3114 + heap->real_size + segment_size > heap->limit) {
3115 + /* Memory limit overflow */
3117 + zend_mm_free_cache(heap);
3119 + HANDLE_UNBLOCK_INTERRUPTIONS();
3121 + zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted at %s:%d (tried to allocate %lu bytes)", heap->limit, __zend_filename, __zend_lineno, size);
3123 + zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted (tried to allocate %lu bytes)", heap->limit, size);
3127 + segment = (zend_mm_segment *) ZEND_MM_STORAGE_ALLOC(segment_size);
3130 + /* Storage manager cannot allocate memory */
3132 + zend_mm_free_cache(heap);
3134 + HANDLE_UNBLOCK_INTERRUPTIONS();
3137 + zend_mm_safe_error(heap, "Out of memory (allocated %ld) at %s:%d (tried to allocate %lu bytes)", heap->real_size, __zend_filename, __zend_lineno, size);
3139 + zend_mm_safe_error(heap, "Out of memory (allocated %ld) (tried to allocate %lu bytes)", heap->real_size, size);
3144 + heap->real_size += segment_size;
3145 + if (heap->real_size > heap->real_peak) {
3146 + heap->real_peak = heap->real_size;
3149 + segment->size = segment_size;
3150 + segment->next_segment = heap->segments_list;
3151 + heap->segments_list = segment;
3153 + best_fit = (zend_mm_free_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE);
3154 + ZEND_MM_MARK_FIRST_BLOCK(best_fit);
3156 + block_size = segment_size - ZEND_MM_ALIGNED_SEGMENT_SIZE - ZEND_MM_ALIGNED_HEADER_SIZE;
3158 + ZEND_MM_LAST_BLOCK(ZEND_MM_BLOCK_AT(best_fit, block_size));
3161 +zend_mm_finished_searching_for_block:
3162 + /* remove from free list */
3163 + HANDLE_BLOCK_INTERRUPTIONS();
3164 + ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_FREED);
3165 + ZEND_MM_CHECK_COOKIE(best_fit);
3166 + ZEND_MM_CHECK_BLOCK_LINKAGE(best_fit);
3167 + zend_mm_remove_from_free_list(heap, best_fit);
3169 + block_size = ZEND_MM_FREE_BLOCK_SIZE(best_fit);
3172 + remaining_size = block_size - true_size;
3174 + if (remaining_size < ZEND_MM_ALIGNED_MIN_HEADER_SIZE) {
3175 + true_size = block_size;
3176 + ZEND_MM_BLOCK(best_fit, ZEND_MM_USED_BLOCK, true_size);
3178 + zend_mm_free_block_canary *new_free_block;
3180 + /* prepare new free block */
3181 + ZEND_MM_BLOCK(best_fit, ZEND_MM_USED_BLOCK, true_size);
3182 + new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(best_fit, true_size);
3183 + ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size);
3185 + /* add the new free block to the free list */
3186 + if (EXPECTED(!keep_rest)) {
3187 + zend_mm_add_to_free_list(heap, new_free_block);
3189 + zend_mm_add_to_rest_list(heap, new_free_block);
3193 + ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
3196 + SUHOSIN_MM_SET_CANARIES(best_fit);
3197 + ((zend_mm_block_canary*)best_fit)->info.size = size;
3198 + SUHOSIN_MM_SET_END_CANARY(best_fit);
3201 + heap->size += true_size;
3202 + if (heap->peak < heap->size) {
3203 + heap->peak = heap->size;
3206 + HANDLE_UNBLOCK_INTERRUPTIONS();
3207 + return ZEND_MM_DATA_OF(best_fit);
3211 +void _zend_mm_free_canary_int(zend_mm_heap_canary *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
3213 + zend_mm_block_canary *mm_block;
3214 + zend_mm_block_canary *next_block;
3217 + if (!ZEND_MM_VALID_PTR(p)) {
3221 + mm_block = ZEND_MM_HEADER_OF(p);
3222 + size = ZEND_MM_BLOCK_SIZE(mm_block);
3224 + SUHOSIN_MM_CHECK_CANARIES(mm_block, "efree()");
3226 + ZEND_MM_CHECK_PROTECTION(mm_block);
3228 +#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
3229 + memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->debug.size);
3232 + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_DESTROY_FREE_MEMORY))) {
3233 + memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->info.size);
3237 + if (EXPECTED(ZEND_MM_SMALL_SIZE(size)) && EXPECTED(heap->cached < ZEND_MM_CACHE_SIZE)) {
3238 + size_t index = ZEND_MM_BUCKET_INDEX(size);
3239 + zend_mm_free_block_canary **cache = &heap->cache[index];
3241 + ((zend_mm_free_block_canary*)mm_block)->prev_free_block = *cache;
3242 + *cache = (zend_mm_free_block_canary*)SUHOSIN_MANGLE_PTR(mm_block);
3243 + heap->cached += size;
3244 + ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED);
3245 +#if ZEND_MM_CACHE_STAT
3246 + if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) {
3247 + heap->cache_stat[index].max_count = heap->cache_stat[index].count;
3254 + HANDLE_BLOCK_INTERRUPTIONS();
3256 + heap->size -= size;
3258 + next_block = ZEND_MM_BLOCK_AT(mm_block, size);
3259 + if (ZEND_MM_IS_FREE_BLOCK(next_block)) {
3260 + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block);
3261 + size += ZEND_MM_FREE_BLOCK_SIZE(next_block);
3263 + if (ZEND_MM_PREV_BLOCK_IS_FREE(mm_block)) {
3264 + mm_block = ZEND_MM_PREV_BLOCK(mm_block);
3265 + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) mm_block);
3266 + size += ZEND_MM_FREE_BLOCK_SIZE(mm_block);
3268 + if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
3269 + ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(mm_block, size))) {
3270 + zend_mm_del_segment(heap, (zend_mm_segment *) ((char *)mm_block - ZEND_MM_ALIGNED_SEGMENT_SIZE));
3272 + ZEND_MM_BLOCK(mm_block, ZEND_MM_FREE_BLOCK, size);
3273 + zend_mm_add_to_free_list(heap, (zend_mm_free_block_canary *) mm_block);
3275 + HANDLE_UNBLOCK_INTERRUPTIONS();
3278 +void *_zend_mm_realloc_canary_int(zend_mm_heap_canary *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
3280 + zend_mm_block_canary *mm_block = ZEND_MM_HEADER_OF(p);
3281 + zend_mm_block_canary *next_block;
3286 + if (UNEXPECTED(!p) || !ZEND_MM_VALID_PTR(p)) {
3287 + return _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
3289 + mm_block = ZEND_MM_HEADER_OF(p);
3290 + true_size = ZEND_MM_TRUE_SIZE(size);
3291 + orig_size = ZEND_MM_BLOCK_SIZE(mm_block);
3293 + SUHOSIN_MM_CHECK_CANARIES(mm_block, "erealloc()");
3295 + ZEND_MM_CHECK_PROTECTION(mm_block);
3297 + if (UNEXPECTED(true_size < size)) {
3298 + goto out_of_memory;
3301 + if (true_size <= orig_size) {
3302 + size_t remaining_size = orig_size - true_size;
3304 + if (remaining_size >= ZEND_MM_ALIGNED_MIN_HEADER_SIZE) {
3305 + zend_mm_free_block_canary *new_free_block;
3307 + HANDLE_BLOCK_INTERRUPTIONS();
3308 + next_block = ZEND_MM_BLOCK_AT(mm_block, orig_size);
3309 + if (ZEND_MM_IS_FREE_BLOCK(next_block)) {
3310 + remaining_size += ZEND_MM_FREE_BLOCK_SIZE(next_block);
3311 + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block);
3314 + /* prepare new free block */
3315 + ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size);
3316 + new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(mm_block, true_size);
3318 + ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size);
3320 + /* add the new free block to the free list */
3321 + zend_mm_add_to_free_list(heap, new_free_block);
3322 + heap->size += (true_size - orig_size);
3323 + HANDLE_UNBLOCK_INTERRUPTIONS();
3325 + ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
3327 + SUHOSIN_MM_SET_CANARIES(mm_block);
3328 + ((zend_mm_block_canary*)mm_block)->info.size = size;
3329 + SUHOSIN_MM_SET_END_CANARY(mm_block);
3335 + if (ZEND_MM_SMALL_SIZE(true_size)) {
3336 + size_t index = ZEND_MM_BUCKET_INDEX(true_size);
3338 + if (heap->cache[index] != NULL) {
3339 + zend_mm_free_block_canary *best_fit;
3340 + zend_mm_free_block_canary **cache;
3342 +#if ZEND_MM_CACHE_STAT
3343 + heap->cache_stat[index].count--;
3344 + heap->cache_stat[index].hit++;
3346 + best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]);
3347 + heap->cache[index] = best_fit->prev_free_block;
3348 + ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
3349 + ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
3351 + SUHOSIN_MM_SET_CANARIES(best_fit);
3352 + ((zend_mm_block_canary*)best_fit)->info.size = size;
3353 + SUHOSIN_MM_SET_END_CANARY(best_fit);
3356 + ptr = ZEND_MM_DATA_OF(best_fit);
3358 +#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
3359 + memcpy(ptr, p, mm_block->debug.size);
3361 + memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE);
3364 + heap->cached -= true_size - orig_size;
3366 + index = ZEND_MM_BUCKET_INDEX(orig_size);
3367 + cache = &heap->cache[index];
3369 + ((zend_mm_free_block_canary*)mm_block)->prev_free_block = *cache;
3370 + *cache = (zend_mm_free_block_canary*)SUHOSIN_MANGLE_PTR(mm_block);
3371 + ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED);
3372 +#if ZEND_MM_CACHE_STAT
3373 + if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) {
3374 + heap->cache_stat[index].max_count = heap->cache_stat[index].count;
3382 + next_block = ZEND_MM_BLOCK_AT(mm_block, orig_size);
3384 + if (ZEND_MM_IS_FREE_BLOCK(next_block)) {
3385 + ZEND_MM_CHECK_COOKIE(next_block);
3386 + ZEND_MM_CHECK_BLOCK_LINKAGE(next_block);
3387 + if (orig_size + ZEND_MM_FREE_BLOCK_SIZE(next_block) >= true_size) {
3388 + size_t block_size = orig_size + ZEND_MM_FREE_BLOCK_SIZE(next_block);
3389 + size_t remaining_size = block_size - true_size;
3391 + HANDLE_BLOCK_INTERRUPTIONS();
3392 + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block);
3394 + if (remaining_size < ZEND_MM_ALIGNED_MIN_HEADER_SIZE) {
3395 + true_size = block_size;
3396 + ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size);
3398 + zend_mm_free_block_canary *new_free_block;
3400 + /* prepare new free block */
3401 + ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size);
3402 + new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(mm_block, true_size);
3403 + ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size);
3405 + /* add the new free block to the free list */
3406 + if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
3407 + ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(new_free_block, remaining_size))) {
3408 + zend_mm_add_to_rest_list(heap, new_free_block);
3410 + zend_mm_add_to_free_list(heap, new_free_block);
3413 + ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
3414 + heap->size = heap->size + true_size - orig_size;
3415 + if (heap->peak < heap->size) {
3416 + heap->peak = heap->size;
3418 + HANDLE_UNBLOCK_INTERRUPTIONS();
3420 + SUHOSIN_MM_SET_CANARIES(mm_block);
3421 + ((zend_mm_block_canary*)mm_block)->info.size = size;
3422 + SUHOSIN_MM_SET_END_CANARY(mm_block);
3425 + } else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
3426 + ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(next_block, ZEND_MM_FREE_BLOCK_SIZE(next_block)))) {
3427 + HANDLE_BLOCK_INTERRUPTIONS();
3428 + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block);
3429 + goto realloc_segment;
3431 + } else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && ZEND_MM_IS_GUARD_BLOCK(next_block)) {
3432 + zend_mm_segment *segment;
3433 + zend_mm_segment *segment_copy;
3434 + size_t segment_size;
3435 + size_t block_size;
3436 + size_t remaining_size;
3438 + HANDLE_BLOCK_INTERRUPTIONS();
3440 + /* segment size, size of block and size of guard block */
3441 + if (true_size > heap->block_size - (ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE)) {
3442 + segment_size = true_size+ZEND_MM_ALIGNED_SEGMENT_SIZE+ZEND_MM_ALIGNED_HEADER_SIZE;
3443 + segment_size = (segment_size + (heap->block_size-1)) & ~(heap->block_size-1);
3445 + segment_size = heap->block_size;
3448 + segment_copy = (zend_mm_segment *) ((char *)mm_block - ZEND_MM_ALIGNED_SEGMENT_SIZE);
3449 + if (segment_size < true_size ||
3450 + heap->real_size + segment_size - segment_copy->size > heap->limit) {
3451 + if (ZEND_MM_IS_FREE_BLOCK(next_block)) {
3452 + zend_mm_add_to_free_list(heap, (zend_mm_free_block_canary *) next_block);
3455 + zend_mm_free_cache(heap);
3457 + HANDLE_UNBLOCK_INTERRUPTIONS();
3459 + zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted at %s:%d (tried to allocate %ld bytes)", heap->limit, __zend_filename, __zend_lineno, size);
3461 + zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted (tried to allocate %ld bytes)", heap->limit, size);
3466 + segment = ZEND_MM_STORAGE_REALLOC(segment_copy, segment_size);
3469 + zend_mm_free_cache(heap);
3471 + HANDLE_UNBLOCK_INTERRUPTIONS();
3474 + zend_mm_safe_error(heap, "Out of memory (allocated %ld) at %s:%d (tried to allocate %ld bytes)", heap->real_size, __zend_filename, __zend_lineno, size);
3476 + zend_mm_safe_error(heap, "Out of memory (allocated %ld) (tried to allocate %ld bytes)", heap->real_size, size);
3480 + heap->real_size += segment_size - segment->size;
3481 + if (heap->real_size > heap->real_peak) {
3482 + heap->real_peak = heap->real_size;
3485 + segment->size = segment_size;
3487 + if (segment != segment_copy) {
3488 + zend_mm_segment **seg = &heap->segments_list;
3489 + while (*seg != segment_copy) {
3490 + seg = &(*seg)->next_segment;
3493 + mm_block = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE);
3494 + ZEND_MM_MARK_FIRST_BLOCK(mm_block);
3497 + block_size = segment_size - ZEND_MM_ALIGNED_SEGMENT_SIZE - ZEND_MM_ALIGNED_HEADER_SIZE;
3498 + remaining_size = block_size - true_size;
3500 + /* setup guard block */
3501 + ZEND_MM_LAST_BLOCK(ZEND_MM_BLOCK_AT(mm_block, block_size));
3503 + if (remaining_size < ZEND_MM_ALIGNED_MIN_HEADER_SIZE) {
3504 + true_size = block_size;
3505 + ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size);
3507 + zend_mm_free_block_canary *new_free_block;
3509 + /* prepare new free block */
3510 + ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size);
3511 + new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(mm_block, true_size);
3512 + ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size);
3514 + /* add the new free block to the free list */
3515 + zend_mm_add_to_rest_list(heap, new_free_block);
3518 + ZEND_MM_SET_DEBUG_INFO(mm_block, size, 1, 1);
3520 + heap->size = heap->size + true_size - orig_size;
3521 + if (heap->peak < heap->size) {
3522 + heap->peak = heap->size;
3525 + HANDLE_UNBLOCK_INTERRUPTIONS();
3527 + SUHOSIN_MM_SET_CANARIES(mm_block);
3528 + ((zend_mm_block_canary*)mm_block)->info.size = size;
3529 + SUHOSIN_MM_SET_END_CANARY(mm_block);
3531 + return ZEND_MM_DATA_OF(mm_block);
3534 + ptr = _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
3535 +#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
3536 + memcpy(ptr, p, mm_block->debug.size);
3538 + memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE);
3540 + _zend_mm_free_canary_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
3544 +ZEND_API size_t _zend_mm_block_size_canary(zend_mm_heap_canary *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
3546 + zend_mm_block_canary *mm_block;
3548 + if (!ZEND_MM_VALID_PTR(p)) {
3551 + mm_block = ZEND_MM_HEADER_OF(p);
3552 + ZEND_MM_CHECK_PROTECTION(mm_block);
3553 +#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
3554 + return mm_block->debug.size;
3556 + return ZEND_MM_BLOCK_SIZE(mm_block);
3560 +#if defined(__GNUC__) && defined(i386)
3562 +static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
3564 + size_t res = nmemb;
3565 + unsigned long overflow = 0;
3567 + __asm__ ("mull %3\n\taddl %4,%0\n\tadcl %1,%1"
3568 + : "=&a"(res), "=&d" (overflow)
3573 + if (UNEXPECTED(overflow)) {
3574 + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
3580 +#elif defined(__GNUC__) && defined(__x86_64__)
3582 +static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
3584 + size_t res = nmemb;
3585 + unsigned long overflow = 0;
3587 + __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1"
3588 + : "=&a"(res), "=&d" (overflow)
3593 + if (UNEXPECTED(overflow)) {
3594 + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
3600 +#elif SIZEOF_SIZE_T == 4 && defined(HAVE_ZEND_LONG64)
3602 +static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
3604 + zend_ulong64 res = (zend_ulong64)nmemb * (zend_ulong64)size + (zend_ulong64)offset;
3606 + if (UNEXPECTED(res > (zend_ulong64)0xFFFFFFFFL)) {
3607 + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
3610 + return (size_t) res;
3615 +static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
3617 + size_t res = nmemb * size + offset;
3618 + double _d = (double)nmemb * (double)size + (double)offset;
3619 + double _delta = (double)res - _d;
3621 + if (UNEXPECTED((_d + _delta ) != _d)) {
3622 + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
3630 + * Local variables:
3632 + * c-basic-offset: 4
3633 + * indent-tabs-mode: t
3638 +++ b/Zend/zend_canary.c
3641 + +----------------------------------------------------------------------+
3642 + | Suhosin-Patch for PHP |
3643 + +----------------------------------------------------------------------+
3644 + | Copyright (c) 2004-2009 Stefan Esser |
3645 + +----------------------------------------------------------------------+
3646 + | This source file is subject to version 2.02 of the PHP license, |
3647 + | that is bundled with this package in the file LICENSE, and is |
3648 + | available at through the world-wide-web at |
3649 + | http://www.php.net/license/2_02.txt. |
3650 + | If you did not receive a copy of the PHP license and are unable to |
3651 + | obtain it through the world-wide-web, please send a note to |
3652 + | license@php.net so we can mail you a copy immediately. |
3653 + +----------------------------------------------------------------------+
3654 + | Author: Stefan Esser <stefan.esser@sektioneins.de> |
3655 + +----------------------------------------------------------------------+
3657 +/* $Id: zend_canary.c,v 1.1 2004/11/26 12:45:41 ionic Exp $ */
3662 +#include <stdlib.h>
3667 +static size_t last_canary = 0x73625123;
3669 +/* will be replaced later with more compatible method */
3670 +ZEND_API void zend_canary(void *buf, int len)
3677 + fd = open("/dev/urandom", 0);
3679 + int r = read(fd, buf, len);
3686 + /* not good but we never want to do this */
3688 + canary = *(unsigned int *)&t + getpid() << 16 + last_canary;
3689 + last_canary ^= (canary << 5) | (canary >> (32-5));
3690 + /* When we ensure full win32 compatibility in next version
3691 + we will replace this with the random number code from zend_alloc.c */
3692 + memcpy(buf, &canary, len);
3699 + * Local variables:
3701 + * c-basic-offset: 4
3703 + * vim600: sw=4 ts=4 fdm=marker
3704 + * vim<600: sw=4 ts=4
3706 --- a/Zend/zend_compile.c
3707 +++ b/Zend/zend_compile.c
3708 @@ -141,6 +141,11 @@ static void zend_destroy_property_info_i
3713 +void *suhosin_zend_destroy_property_info_internal = zend_destroy_property_info_internal;
3714 +void *suhosin_zend_destroy_property_info = zend_destroy_property_info;
3717 static void build_runtime_defined_function_key(zval *result, const char *name, int name_length TSRMLS_DC) /* {{{ */
3719 char char_pos_buf[32];
3720 --- a/Zend/zend_compile.h
3721 +++ b/Zend/zend_compile.h
3722 @@ -685,6 +685,11 @@ ZEND_API zend_bool zend_is_auto_global(c
3723 ZEND_API zend_bool zend_is_auto_global_quick(const char *name, uint name_len, ulong hashval TSRMLS_DC);
3724 ZEND_API size_t zend_dirname(char *path, size_t len);
3727 +extern void *suhosin_zend_destroy_property_info_internal;
3728 +extern void *suhosin_zend_destroy_property_info;
3731 int zendlex(znode *zendlval TSRMLS_DC);
3733 int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC);
3734 --- a/Zend/zend_constants.c
3735 +++ b/Zend/zend_constants.c
3736 @@ -117,6 +117,76 @@ void zend_register_standard_constants(TS
3738 REGISTER_MAIN_LONG_CONSTANT("DEBUG_BACKTRACE_PROVIDE_OBJECT", DEBUG_BACKTRACE_PROVIDE_OBJECT, CONST_PERSISTENT | CONST_CS);
3739 REGISTER_MAIN_LONG_CONSTANT("DEBUG_BACKTRACE_IGNORE_ARGS", DEBUG_BACKTRACE_IGNORE_ARGS, CONST_PERSISTENT | CONST_CS);
3741 + REGISTER_MAIN_LONG_CONSTANT("S_MEMORY", S_MEMORY, CONST_PERSISTENT | CONST_CS);
3742 + REGISTER_MAIN_LONG_CONSTANT("S_VARS", S_VARS, CONST_PERSISTENT | CONST_CS);
3743 + REGISTER_MAIN_LONG_CONSTANT("S_FILES", S_FILES, CONST_PERSISTENT | CONST_CS);
3744 + REGISTER_MAIN_LONG_CONSTANT("S_INCLUDE", S_INCLUDE, CONST_PERSISTENT | CONST_CS);
3745 + REGISTER_MAIN_LONG_CONSTANT("S_SQL", S_SQL, CONST_PERSISTENT | CONST_CS);
3746 + REGISTER_MAIN_LONG_CONSTANT("S_EXECUTOR", S_EXECUTOR, CONST_PERSISTENT | CONST_CS);
3747 + REGISTER_MAIN_LONG_CONSTANT("S_MAIL", S_MAIL, CONST_PERSISTENT | CONST_CS);
3748 + REGISTER_MAIN_LONG_CONSTANT("S_SESSION", S_SESSION, CONST_PERSISTENT | CONST_CS);
3749 + REGISTER_MAIN_LONG_CONSTANT("S_MISC", S_MISC, CONST_PERSISTENT | CONST_CS);
3750 + REGISTER_MAIN_LONG_CONSTANT("S_INTERNAL", S_INTERNAL, CONST_PERSISTENT | CONST_CS);
3751 + REGISTER_MAIN_LONG_CONSTANT("S_ALL", S_ALL, CONST_PERSISTENT | CONST_CS);
3753 + /* error levels */
3754 + REGISTER_MAIN_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */
3755 + REGISTER_MAIN_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */
3756 + REGISTER_MAIN_LONG_CONSTANT("LOG_CRIT", LOG_CRIT, CONST_CS | CONST_PERSISTENT); /* critical conditions */
3757 + REGISTER_MAIN_LONG_CONSTANT("LOG_ERR", LOG_ERR, CONST_CS | CONST_PERSISTENT);
3758 + REGISTER_MAIN_LONG_CONSTANT("LOG_WARNING", LOG_WARNING, CONST_CS | CONST_PERSISTENT);
3759 + REGISTER_MAIN_LONG_CONSTANT("LOG_NOTICE", LOG_NOTICE, CONST_CS | CONST_PERSISTENT);
3760 + REGISTER_MAIN_LONG_CONSTANT("LOG_INFO", LOG_INFO, CONST_CS | CONST_PERSISTENT);
3761 + REGISTER_MAIN_LONG_CONSTANT("LOG_DEBUG", LOG_DEBUG, CONST_CS | CONST_PERSISTENT);
3762 + /* facility: type of program logging the message */
3763 + REGISTER_MAIN_LONG_CONSTANT("LOG_KERN", LOG_KERN, CONST_CS | CONST_PERSISTENT);
3764 + REGISTER_MAIN_LONG_CONSTANT("LOG_USER", LOG_USER, CONST_CS | CONST_PERSISTENT); /* generic user level */
3765 + REGISTER_MAIN_LONG_CONSTANT("LOG_MAIL", LOG_MAIL, CONST_CS | CONST_PERSISTENT); /* log to email */
3766 + REGISTER_MAIN_LONG_CONSTANT("LOG_DAEMON", LOG_DAEMON, CONST_CS | CONST_PERSISTENT); /* other system daemons */
3767 + REGISTER_MAIN_LONG_CONSTANT("LOG_AUTH", LOG_AUTH, CONST_CS | CONST_PERSISTENT);
3768 + REGISTER_MAIN_LONG_CONSTANT("LOG_SYSLOG", LOG_SYSLOG, CONST_CS | CONST_PERSISTENT);
3769 + REGISTER_MAIN_LONG_CONSTANT("LOG_LPR", LOG_LPR, CONST_CS | CONST_PERSISTENT);
3771 + /* No LOG_NEWS on HP-UX */
3772 + REGISTER_MAIN_LONG_CONSTANT("LOG_NEWS", LOG_NEWS, CONST_CS | CONST_PERSISTENT); /* usenet new */
3775 + /* No LOG_UUCP on HP-UX */
3776 + REGISTER_MAIN_LONG_CONSTANT("LOG_UUCP", LOG_UUCP, CONST_CS | CONST_PERSISTENT);
3779 + /* apparently some systems don't have this one */
3780 + REGISTER_MAIN_LONG_CONSTANT("LOG_CRON", LOG_CRON, CONST_CS | CONST_PERSISTENT);
3782 +#ifdef LOG_AUTHPRIV
3783 + /* AIX doesn't have LOG_AUTHPRIV */
3784 + REGISTER_MAIN_LONG_CONSTANT("LOG_AUTHPRIV", LOG_AUTHPRIV, CONST_CS | CONST_PERSISTENT);
3787 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL0", LOG_LOCAL0, CONST_CS | CONST_PERSISTENT);
3788 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL1", LOG_LOCAL1, CONST_CS | CONST_PERSISTENT);
3789 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL2", LOG_LOCAL2, CONST_CS | CONST_PERSISTENT);
3790 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL3", LOG_LOCAL3, CONST_CS | CONST_PERSISTENT);
3791 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL4", LOG_LOCAL4, CONST_CS | CONST_PERSISTENT);
3792 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL5", LOG_LOCAL5, CONST_CS | CONST_PERSISTENT);
3793 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL6", LOG_LOCAL6, CONST_CS | CONST_PERSISTENT);
3794 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL7", LOG_LOCAL7, CONST_CS | CONST_PERSISTENT);
3797 + REGISTER_MAIN_LONG_CONSTANT("LOG_PID", LOG_PID, CONST_CS | CONST_PERSISTENT);
3798 + REGISTER_MAIN_LONG_CONSTANT("LOG_CONS", LOG_CONS, CONST_CS | CONST_PERSISTENT);
3799 + REGISTER_MAIN_LONG_CONSTANT("LOG_ODELAY", LOG_ODELAY, CONST_CS | CONST_PERSISTENT);
3800 + REGISTER_MAIN_LONG_CONSTANT("LOG_NDELAY", LOG_NDELAY, CONST_CS | CONST_PERSISTENT);
3802 + REGISTER_MAIN_LONG_CONSTANT("LOG_NOWAIT", LOG_NOWAIT, CONST_CS | CONST_PERSISTENT);
3805 + /* AIX doesn't have LOG_PERROR */
3806 + REGISTER_MAIN_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/
3810 /* true/false constants */
3813 --- a/Zend/zend_errors.h
3814 +++ b/Zend/zend_errors.h
3816 #define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED | E_STRICT)
3817 #define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
3820 +#define S_MEMORY (1<<0L)
3821 +#define S_MISC (1<<1L)
3822 +#define S_VARS (1<<2L)
3823 +#define S_FILES (1<<3L)
3824 +#define S_INCLUDE (1<<4L)
3825 +#define S_SQL (1<<5L)
3826 +#define S_EXECUTOR (1<<6L)
3827 +#define S_MAIL (1<<7L)
3828 +#define S_SESSION (1<<8L)
3829 +#define S_INTERNAL (1<<29L)
3830 +#define S_ALL (S_MEMORY | S_VARS | S_INCLUDE | S_FILES | S_MAIL | S_SESSION | S_MISC | S_SQL | S_EXECUTOR)
3833 #endif /* ZEND_ERRORS_H */
3836 --- php-5.5.0/Zend/zend_hash.c~ 2013-06-20 23:57:44.000000000 +0300
3837 +++ php-5.5.0/Zend/zend_hash.c 2013-06-20 23:58:38.383348644 +0300
3841 #include "zend_globals.h"
3842 +#include "zend_compile.h"
3844 #define CONNECT_TO_BUCKET_DLLIST(element, list_head) \
3845 (element)->pNext = (list_head); \
3846 @@ -103,6 +104,199 @@ ZEND_API ulong zend_hash_func(const char
3847 return zend_inline_hash_func(arKey, nKeyLength);
3852 +static MUTEX_T zend_hash_dprot_mx_reader;
3853 +static MUTEX_T zend_hash_dprot_mx_writer;
3854 +static unsigned int zend_hash_dprot_reader;
3856 +static unsigned int zend_hash_dprot_counter;
3857 +static unsigned int zend_hash_dprot_curmax;
3858 +static dtor_func_t *zend_hash_dprot_table = NULL;
3860 +static void zend_hash_dprot_begin_read()
3863 + tsrm_mutex_lock(zend_hash_dprot_mx_reader);
3864 + if ((++(zend_hash_dprot_reader)) == 1) {
3865 + tsrm_mutex_lock(zend_hash_dprot_mx_writer);
3867 + tsrm_mutex_unlock(zend_hash_dprot_mx_reader);
3871 +static void zend_hash_dprot_end_read()
3874 + tsrm_mutex_lock(zend_hash_dprot_mx_reader);
3875 + if ((--(zend_hash_dprot_reader)) == 0) {
3876 + tsrm_mutex_unlock(zend_hash_dprot_mx_writer);
3878 + tsrm_mutex_unlock(zend_hash_dprot_mx_reader);
3882 +static void zend_hash_dprot_begin_write()
3885 + tsrm_mutex_lock(zend_hash_dprot_mx_writer);
3889 +static void zend_hash_dprot_end_write()
3892 + tsrm_mutex_unlock(zend_hash_dprot_mx_writer);
3896 +/*ZEND_API void zend_hash_dprot_dtor()
3899 + tsrm_mutex_free(zend_hash_dprot_mx_reader);
3900 + tsrm_mutex_free(zend_hash_dprot_mx_writer);
3902 + free(zend_hash_dprot_table);
3905 +static void zend_hash_add_destructor(dtor_func_t pDestructor)
3907 + int left, right, mid;
3908 + zend_bool found = 0;
3909 + unsigned long value;
3911 + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR || pDestructor == ZVAL_INTERNAL_PTR_DTOR
3912 + || pDestructor == ZEND_FUNCTION_DTOR || pDestructor == ZEND_CLASS_DTOR) {
3916 + if (zend_hash_dprot_table == NULL) {
3918 + zend_hash_dprot_mx_reader = tsrm_mutex_alloc();
3919 + zend_hash_dprot_mx_writer = tsrm_mutex_alloc();
3920 + zend_hash_dprot_reader = 0;
3922 + zend_hash_dprot_counter = 0;
3923 + zend_hash_dprot_curmax = 256;
3924 + zend_hash_dprot_table = (dtor_func_t *) malloc(256 * sizeof(dtor_func_t));
3927 + zend_hash_dprot_begin_write();
3929 + if (zend_hash_dprot_counter == 0) {
3930 + zend_hash_dprot_counter++;
3931 + zend_hash_dprot_table[0] = pDestructor;
3933 + value = (unsigned long) pDestructor;
3935 + right = zend_hash_dprot_counter-1;
3938 + while (left < right) {
3939 + mid = (right - left) >> 1;
3941 + if ((unsigned long)zend_hash_dprot_table[mid] == value) {
3945 + if (value < (unsigned long)zend_hash_dprot_table[mid]) {
3951 + if ((unsigned long)zend_hash_dprot_table[left] == value) {
3957 + if (zend_hash_dprot_counter >= zend_hash_dprot_curmax) {
3958 + zend_hash_dprot_curmax += 256;
3959 + zend_hash_dprot_table = (dtor_func_t *) realloc(zend_hash_dprot_table, zend_hash_dprot_curmax * sizeof(dtor_func_t));
3962 + if ((unsigned long)zend_hash_dprot_table[left] < value) {
3963 + memmove(zend_hash_dprot_table+left+2, zend_hash_dprot_table+left+1, (zend_hash_dprot_counter-left-1)*sizeof(dtor_func_t));
3964 + zend_hash_dprot_table[left+1] = pDestructor;
3966 + memmove(zend_hash_dprot_table+left+1, zend_hash_dprot_table+left, (zend_hash_dprot_counter-left)*sizeof(dtor_func_t));
3967 + zend_hash_dprot_table[left] = pDestructor;
3970 + zend_hash_dprot_counter++;
3974 + zend_hash_dprot_end_write();
3977 +static void zend_hash_check_destructor(dtor_func_t pDestructor)
3979 + unsigned long value;
3981 + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR || pDestructor == ZVAL_INTERNAL_PTR_DTOR
3982 +#ifdef ZEND_ENGINE_2
3983 + || pDestructor == suhosin_zend_destroy_property_info_internal || pDestructor == suhosin_zend_destroy_property_info
3985 + || pDestructor == ZEND_FUNCTION_DTOR || pDestructor == ZEND_CLASS_DTOR) {
3989 + zend_hash_dprot_begin_read();
3991 + if (zend_hash_dprot_counter > 0) {
3992 + int left, right, mid;
3993 + zend_bool found = 0;
3995 + value = (unsigned long) pDestructor;
3997 + right = zend_hash_dprot_counter-1;
3999 + while (left < right) {
4000 + mid = (right - left) >> 1;
4002 + if ((unsigned long)zend_hash_dprot_table[mid] == value) {
4006 + if (value < (unsigned long)zend_hash_dprot_table[mid]) {
4012 + if ((unsigned long)zend_hash_dprot_table[left] == value) {
4017 + zend_hash_dprot_end_read();
4019 + zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown Hashtable destructor");
4020 + if (SUHOSIN_CONFIG(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR) == 0) {
4027 + zend_hash_dprot_end_read();
4029 + zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown Hashtable destructor");
4030 + if (SUHOSIN_CONFIG(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR) == 0) {
4036 + zend_hash_dprot_end_read();
4040 +#define zend_hash_add_destructor(pDestructor) do {} while(0)
4041 +#define zend_hash_check_destructor(pDestructor) do {} while(0)
4044 #define UPDATE_DATA(ht, p, pData, nDataSize) \
4045 if (nDataSize == sizeof(void*)) { \
4046 @@ -163,6 +357,7 @@ ZEND_API int _zend_hash_init(HashTable *
4048 ht->nTableMask = 0; /* 0 means that ht->arBuckets is uninitialized */
4049 ht->pDestructor = pDestructor;
4050 + zend_hash_add_destructor(pDestructor);
4051 ht->arBuckets = (Bucket**)&uninitialized_bucket;
4052 ht->pListHead = NULL;
4053 ht->pListTail = NULL;
4054 @@ -230,6 +425,7 @@ ZEND_API int _zend_hash_add_or_update(Ha
4058 + zend_hash_check_destructor(ht->pDestructor);
4059 if (ht->pDestructor) {
4060 ht->pDestructor(p->pData);
4062 @@ -307,6 +503,7 @@ ZEND_API int _zend_hash_quick_add_or_upd
4066 + zend_hash_check_destructor(ht->pDestructor);
4067 if (ht->pDestructor) {
4068 ht->pDestructor(p->pData);
4070 @@ -394,6 +591,7 @@ ZEND_API int _zend_hash_index_update_or_
4074 + zend_hash_check_destructor(ht->pDestructor);
4075 if (ht->pDestructor) {
4076 ht->pDestructor(p->pData);
4079 ht->pInternalPointer = p->pListNext;
4081 ht->nNumOfElements--;
4082 + zend_hash_check_destructor(ht->pDestructor);
4083 if (ht->pDestructor) {
4084 ht->pDestructor(p->pData);
4086 @@ -553,6 +752,7 @@ ZEND_API void zend_hash_destroy(HashTabl
4087 SET_INCONSISTENT(HT_IS_DESTROYING);
4090 + zend_hash_check_destructor(ht->pDestructor);
4094 @@ -646,6 +846,7 @@ static Bucket *zend_hash_apply_deleter(H
4095 ht->nNumOfElements--;
4096 HANDLE_UNBLOCK_INTERRUPTIONS();
4098 + zend_hash_check_destructor(ht->pDestructor);
4099 if (ht->pDestructor) {
4100 ht->pDestructor(p->pData);
4102 @@ -666,6 +867,7 @@ ZEND_API void zend_hash_graceful_destroy
4106 + zend_hash_check_destructor(ht->pDestructor);
4108 p = zend_hash_apply_deleter(ht, p);
4110 --- a/Zend/zend_llist.c
4111 +++ b/Zend/zend_llist.c
4113 #include "zend_llist.h"
4114 #include "zend_qsort.h"
4118 +static MUTEX_T zend_llist_dprot_mx_reader;
4119 +static MUTEX_T zend_llist_dprot_mx_writer;
4120 +static unsigned int zend_llist_dprot_reader;
4122 +static unsigned int zend_llist_dprot_counter;
4123 +static unsigned int zend_llist_dprot_curmax;
4124 +static llist_dtor_func_t *zend_llist_dprot_table = NULL;
4126 +static void zend_llist_dprot_begin_read()
4129 + tsrm_mutex_lock(zend_llist_dprot_mx_reader);
4130 + if ((++(zend_llist_dprot_reader)) == 1) {
4131 + tsrm_mutex_lock(zend_llist_dprot_mx_writer);
4133 + tsrm_mutex_unlock(zend_llist_dprot_mx_reader);
4137 +static void zend_llist_dprot_end_read()
4140 + tsrm_mutex_lock(zend_llist_dprot_mx_reader);
4141 + if ((--(zend_llist_dprot_reader)) == 0) {
4142 + tsrm_mutex_unlock(zend_llist_dprot_mx_writer);
4144 + tsrm_mutex_unlock(zend_llist_dprot_mx_reader);
4148 +static void zend_llist_dprot_begin_write()
4151 + tsrm_mutex_lock(zend_llist_dprot_mx_writer);
4155 +static void zend_llist_dprot_end_write()
4158 + tsrm_mutex_unlock(zend_llist_dprot_mx_writer);
4162 +/*ZEND_API void zend_llist_dprot_dtor()
4165 + tsrm_mutex_free(zend_llist_dprot_mx_reader);
4166 + tsrm_mutex_free(zend_llist_dprot_mx_writer);
4168 + free(zend_llist_dprot_table);
4171 +static void zend_llist_add_destructor(llist_dtor_func_t pDestructor)
4173 + int left, right, mid;
4174 + zend_bool found = 0;
4175 + unsigned long value;
4177 + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR) {
4181 + if (zend_llist_dprot_table == NULL) {
4183 + zend_llist_dprot_mx_reader = tsrm_mutex_alloc();
4184 + zend_llist_dprot_mx_writer = tsrm_mutex_alloc();
4185 + zend_llist_dprot_reader = 0;
4187 + zend_llist_dprot_counter = 0;
4188 + zend_llist_dprot_curmax = 256;
4189 + zend_llist_dprot_table = (llist_dtor_func_t *) malloc(256 * sizeof(llist_dtor_func_t));
4192 + zend_llist_dprot_begin_write();
4194 + if (zend_llist_dprot_counter == 0) {
4195 + zend_llist_dprot_counter++;
4196 + zend_llist_dprot_table[0] = pDestructor;
4198 + value = (unsigned long) pDestructor;
4200 + right = zend_llist_dprot_counter-1;
4203 + while (left < right) {
4204 + mid = (right - left) >> 1;
4206 + if ((unsigned long)zend_llist_dprot_table[mid] == value) {
4210 + if (value < (unsigned long)zend_llist_dprot_table[mid]) {
4216 + if ((unsigned long)zend_llist_dprot_table[left] == value) {
4222 + if (zend_llist_dprot_counter >= zend_llist_dprot_curmax) {
4223 + zend_llist_dprot_curmax += 256;
4224 + zend_llist_dprot_table = (llist_dtor_func_t *) realloc(zend_llist_dprot_table, zend_llist_dprot_curmax * sizeof(llist_dtor_func_t));
4227 + if ((unsigned long)zend_llist_dprot_table[left] < value) {
4228 + memmove(zend_llist_dprot_table+left+2, zend_llist_dprot_table+left+1, (zend_llist_dprot_counter-left-1)*sizeof(llist_dtor_func_t));
4229 + zend_llist_dprot_table[left+1] = pDestructor;
4231 + memmove(zend_llist_dprot_table+left+1, zend_llist_dprot_table+left, (zend_llist_dprot_counter-left)*sizeof(llist_dtor_func_t));
4232 + zend_llist_dprot_table[left] = pDestructor;
4235 + zend_llist_dprot_counter++;
4239 + zend_llist_dprot_end_write();
4242 +static void zend_llist_check_destructor(llist_dtor_func_t pDestructor)
4244 + unsigned long value;
4246 + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR) {
4250 + zend_llist_dprot_begin_read();
4252 + if (zend_llist_dprot_counter > 0) {
4253 + int left, right, mid;
4254 + zend_bool found = 0;
4256 + value = (unsigned long) pDestructor;
4258 + right = zend_llist_dprot_counter-1;
4260 + while (left < right) {
4261 + mid = (right - left) >> 1;
4263 + if ((unsigned long)zend_llist_dprot_table[mid] == value) {
4267 + if (value < (unsigned long)zend_llist_dprot_table[mid]) {
4273 + if ((unsigned long)zend_llist_dprot_table[left] == value) {
4278 + zend_llist_dprot_end_read();
4280 + zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown llist destructor");
4281 + if (SUHOSIN_CONFIG(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR) == 0) {
4288 + zend_llist_dprot_end_read();
4290 + zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown llist destructor");
4291 + if (SUHOSIN_CONFIG(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR) == 0) {
4297 + zend_llist_dprot_end_read();
4300 +#define zend_llist_add_destructor(pDestructor) do {} while(0)
4301 +#define zend_llist_check_destructor(pDestructor) do {} while(0)
4304 ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent)
4307 @@ -30,6 +218,7 @@ ZEND_API void zend_llist_init(zend_llist
4311 + zend_llist_add_destructor(dtor);
4312 l->persistent = persistent;
4315 @@ -81,6 +270,7 @@ ZEND_API void zend_llist_prepend_element
4317 (l)->tail = (current)->prev;\
4319 + zend_llist_check_destructor((l)->dtor); \
4321 (l)->dtor((current)->data);\
4323 @@ -108,6 +298,7 @@ ZEND_API void zend_llist_destroy(zend_ll
4325 zend_llist_element *current=l->head, *next;
4327 + zend_llist_check_destructor(l->dtor);
4329 next = current->next;
4331 @@ -133,6 +324,7 @@ ZEND_API void *zend_llist_remove_tail(ze
4332 zend_llist_element *old_tail;
4335 + zend_llist_check_destructor((l)->dtor);
4336 if ((old_tail = l->tail)) {
4337 if (old_tail->prev) {
4338 old_tail->prev->next = NULL;
4339 --- a/Zend/zend_operators.c
4340 +++ b/Zend/zend_operators.c
4341 @@ -150,9 +150,14 @@ ZEND_API void convert_scalar_to_number(z
4347 strval = Z_STRVAL_P(op);
4348 - if ((Z_TYPE_P(op)=is_numeric_string(strval, Z_STRLEN_P(op), &Z_LVAL_P(op), &Z_DVAL_P(op), 1)) == 0) {
4349 + strl = Z_STRLEN_P(op);
4351 + Z_STRLEN_P(op) = 0;
4353 + if ((Z_TYPE_P(op)=is_numeric_string(strval, strl, &Z_LVAL_P(op), &Z_DVAL_P(op), 1)) == 0) {
4357 @@ -184,7 +189,8 @@ ZEND_API void convert_scalar_to_number(z
4359 switch (Z_TYPE_P(op)) { \
4363 + Z_STRLEN(holder) = 0; \
4364 if ((Z_TYPE(holder)=is_numeric_string(Z_STRVAL_P(op), Z_STRLEN_P(op), &Z_LVAL(holder), &Z_DVAL(holder), 1)) == 0) { \
4365 ZVAL_LONG(&(holder), 0); \
4367 @@ -226,6 +232,7 @@ ZEND_API void convert_scalar_to_number(z
4368 Z_LVAL(holder) = zend_dval_to_lval(Z_DVAL_P(op)); \
4371 + Z_STRLEN(holder) = 0; \
4372 Z_LVAL(holder) = strtol(Z_STRVAL_P(op), NULL, 10); \
4375 @@ -268,6 +275,7 @@ ZEND_API void convert_scalar_to_number(z
4376 Z_LVAL(holder) = (Z_DVAL_P(op) ? 1 : 0); \
4379 + Z_STRLEN(holder) = 0; \
4380 if (Z_STRLEN_P(op) == 0 \
4381 || (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) { \
4382 Z_LVAL(holder) = 0; \
4383 @@ -353,6 +361,9 @@ ZEND_API void convert_to_long_base(zval
4385 char *strval = Z_STRVAL_P(op);
4388 + Z_STRLEN_P(op) = 0;
4390 Z_LVAL_P(op) = strtol(strval, NULL, base);
4393 @@ -413,6 +424,9 @@ ZEND_API void convert_to_double(zval *op
4395 char *strval = Z_STRVAL_P(op);
4398 + Z_STRLEN_P(op) = 0;
4400 Z_DVAL_P(op) = zend_strtod(strval, NULL);
4403 @@ -499,8 +513,14 @@ ZEND_API void convert_to_boolean(zval *o
4405 if (Z_STRLEN_P(op) == 0
4406 || (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) {
4408 + Z_STRLEN_P(op) = 0;
4413 + Z_STRLEN_P(op) = 0;
4418 @@ -614,6 +634,9 @@ static void convert_scalar_to_array(zval
4423 + Z_STRLEN_P(op) = 0;
4427 ALLOC_HASHTABLE(Z_ARRVAL_P(op));
4428 --- a/Zend/zend_variables.c
4429 +++ b/Zend/zend_variables.c
4430 @@ -34,6 +34,9 @@ ZEND_API void _zval_dtor_func(zval *zval
4432 CHECK_ZVAL_STRING_REL(zvalue);
4433 STR_FREE_REL(zvalue->value.str.val);
4435 + zvalue->value.str.len = 0;
4439 case IS_CONSTANT_ARRAY: {
4440 @@ -78,6 +81,9 @@ ZEND_API void _zval_internal_dtor(zval *
4442 CHECK_ZVAL_STRING_REL(zvalue);
4443 str_free(zvalue->value.str.val);
4445 + zvalue->value.str.len = 0;
4449 case IS_CONSTANT_ARRAY:
4450 --- php-5.5.0alpha1/configure.in~ 2012-11-17 13:36:25.000000000 +0200
4451 +++ php-5.5.0alpha1/configure.in 2012-11-17 13:37:55.705648875 +0200
4452 @@ -359,6 +359,7 @@ case $host_alias in
4456 +sinclude(main/suhosin_patch.m4)
4458 dnl Include Zend and TSRM configurations.
4459 dnl -------------------------------------------------------------------------
4460 @@ -1439,7 +1439,7 @@
4461 php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
4462 strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
4463 network.c php_open_temporary_file.c \
4464 - output.c getopt.c)
4465 + output.c getopt.c suhosin_patch.c)
4467 PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
4468 plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \
4469 @@ -1467,7 +1467,8 @@
4470 zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
4471 zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
4472 zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \
4473 - zend_closures.c zend_float.c zend_string.c zend_signal.c zend_generators.c)
4474 + zend_closures.c zend_float.c zend_string.c zend_signal.c zend_generators.c \
4475 + zend_canary.c zend_alloc_canary.c)
4477 if test -r "$abs_srcdir/Zend/zend_objects.c"; then
4478 PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c)
4479 --- a/ext/standard/dl.c
4480 +++ b/ext/standard/dl.c
4481 @@ -246,6 +246,23 @@ PHPAPI int php_load_extension(char *file
4487 + if (strncmp("suhosin", module_entry->name, sizeof("suhosin")-1) == 0) {
4489 + /* sucessfully loaded suhosin extension, now check for logging function replacement */
4490 + log_func = (void *) DL_FETCH_SYMBOL(handle, "suhosin_log");
4491 + if (log_func == NULL) {
4492 + log_func = (void *) DL_FETCH_SYMBOL(handle, "_suhosin_log");
4494 + if (log_func != NULL) {
4495 + zend_suhosin_log = log_func;
4497 + zend_suhosin_log(S_MISC, "could not replace logging function");
4505 #--- a/ext/standard/info.c
4506 #+++ b/ext/standard/info.c
4507 #@@ -785,6 +785,33 @@ PHPAPI void php_print_info(int flag TSRM
4509 # php_info_print_table_end();
4511 #+ /* Suhosin Patch */
4512 #+ php_info_print_box_start(0);
4513 #+ if (expose_php && !sapi_module.phpinfo_as_text) {
4514 #+ PUTS("<a href=\"http://www.suhosin.org\"><img border=\"0\" src=\"");
4515 #+ if (SG(request_info).request_uri) {
4516 #+ char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC);
4520 #+ PUTS("?="SUHOSIN_LOGO_GUID"\" alt=\"Suhosin logo\" /></a>\n");
4522 #+ PUTS("This server is protected with the Suhosin Patch ");
4523 #+ if (sapi_module.phpinfo_as_text) {
4524 #+ PUTS(SUHOSIN_PATCH_VERSION);
4526 #+ zend_html_puts(SUHOSIN_PATCH_VERSION, strlen(SUHOSIN_PATCH_VERSION) TSRMLS_CC);
4528 #+ PUTS(!sapi_module.phpinfo_as_text?"<br />":"\n");
4529 #+ if (sapi_module.phpinfo_as_text) {
4530 #+ PUTS("Copyright (c) 2006-2007 Hardened-PHP Project\n");
4531 #+ PUTS("Copyright (c) 2007-2009 SektionEins GmbH\n");
4533 #+ PUTS("Copyright (c) 2006-2007 <a href=\"http://www.hardened-php.net/\">Hardened-PHP Project</a>\n");
4534 #+ PUTS("Copyright (c) 2007-2009 <a href=\"http://www.sektioneins.de/\">SektionEins GmbH</a>\n");
4536 #+ php_info_print_box_end();
4539 # php_info_print_box_start(0);
4540 # if (expose_php && !sapi_module.phpinfo_as_text) {
4541 --- a/ext/standard/syslog.c
4542 +++ b/ext/standard/syslog.c
4545 PHP_MINIT_FUNCTION(syslog)
4549 REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */
4550 REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */
4551 @@ -95,6 +96,7 @@ PHP_MINIT_FUNCTION(syslog)
4552 /* AIX doesn't have LOG_PERROR */
4553 REGISTER_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/
4556 BG(syslog_device)=NULL;
4559 --- a/main/fopen_wrappers.c
4560 +++ b/main/fopen_wrappers.c
4561 @@ -84,13 +84,8 @@ or a tightening during activation/runtim
4562 PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
4564 char **p, *pathbuf, *ptr, *end;
4566 - char *base = (char *) mh_arg2;
4568 - char *base = (char *) ts_resource(*((int *) mh_arg2));
4571 - p = (char **) (base + (size_t) mh_arg1);
4572 + p = &PG(open_basedir);
4574 if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) {
4575 /* We're in a PHP_INI_SYSTEM context, no restrictions */
4581 #include "rfc1867.h"
4583 +#include "suhosin_globals.h"
4588 @@ -473,7 +476,7 @@ PHP_INI_BEGIN()
4589 STD_PHP_INI_ENTRY("extension_dir", PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir, php_core_globals, core_globals)
4590 STD_PHP_INI_ENTRY("include_path", PHP_INCLUDE_PATH, PHP_INI_ALL, OnUpdateStringUnempty, include_path, php_core_globals, core_globals)
4591 PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnUpdateTimeout)
4592 - STD_PHP_INI_ENTRY("open_basedir", NULL, PHP_INI_ALL, OnUpdateBaseDir, open_basedir, php_core_globals, core_globals)
4593 + PHP_INI_ENTRY("open_basedir", NULL, PHP_INI_ALL, OnUpdateBaseDir)
4595 STD_PHP_INI_BOOLEAN("file_uploads", "1", PHP_INI_SYSTEM, OnUpdateBool, file_uploads, php_core_globals, core_globals)
4596 STD_PHP_INI_ENTRY("upload_max_filesize", "2M", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateLong, upload_max_filesize, php_core_globals, core_globals)
4597 @@ -1884,6 +1887,10 @@ void dummy_invalid_parameter_handler(
4602 +PHPAPI void suhosin_startup();
4605 /* {{{ php_module_startup
4607 int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules, uint num_additional_modules)
4608 @@ -1927,6 +1934,10 @@ int php_module_startup(sapi_module_struc
4609 php_win32_init_rng_lock();
4613 + suhosin_startup();
4616 module_shutdown = 0;
4618 sapi_initialize_empty_request(TSRMLS_C);
4619 @@ -2051,7 +2062,11 @@ int php_module_startup(sapi_module_struc
4620 REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT | CONST_CS);
4621 REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
4622 REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, CONST_PERSISTENT | CONST_CS);
4623 - REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS);
4625 + REGISTER_MAIN_LONG_CONSTANT("SUHOSIN_PATCH", 1, CONST_PERSISTENT | CONST_CS);
4626 + REGISTER_MAIN_STRINGL_CONSTANT("SUHOSIN_PATCH_VERSION", SUHOSIN_PATCH_VERSION, sizeof(SUHOSIN_PATCH_VERSION)-1, CONST_PERSISTENT | CONST_CS);
4628 + REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS);
4629 REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", LONG_MAX, CONST_PERSISTENT | CONST_CS);
4630 REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", sizeof(long), CONST_PERSISTENT | CONST_CS);
4634 @@ -453,6 +453,10 @@ END_EXTERN_C()
4636 #endif /* !XtOffsetOf */
4639 +#include "suhosin_patch.h"
4645 #--- php-5.4.6/main/php_logos.c~ 2012-08-23 12:04:01.000000000 +0300
4646 #+++ php-5.4.6/main/php_logos.c 2012-08-23 12:04:39.401608052 +0300
4647 #@@ -50,6 +50,10 @@ PHPAPI int php_unregister_info_logo(char
4648 # return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string));
4652 #+#include "suhosin_logo.h"
4655 # int php_init_info_logos(void)
4657 # if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE)
4659 # php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
4660 # php_register_info_logo(PLD_LOGO_GUID , "image/png", pld_logo , sizeof(pld_logo));
4663 #+ php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo , sizeof(suhosin_logo));
4669 --- a/main/snprintf.c
4670 +++ b/main/snprintf.c
4671 @@ -782,6 +782,10 @@ static int format_converter(register buf
4676 + zend_suhosin_log(S_MISC, "'Z' specifier within format string");
4679 zvp = (zval*) va_arg(ap, zval*);
4680 zend_make_printable_zval(zvp, &zcopy, &free_zcopy);
4682 @@ -792,6 +796,7 @@ static int format_converter(register buf
4683 if (adjust_precision && precision < s_len) {
4690 @@ -1093,7 +1098,11 @@ static int format_converter(register buf
4695 + zend_suhosin_log(S_MISC, "'n' specifier within format string");
4697 *(va_arg(ap, int *)) = cc;
4702 --- a/main/spprintf.c
4703 +++ b/main/spprintf.c
4704 @@ -390,6 +390,10 @@ static void xbuf_format_converter(smart_
4709 + zend_suhosin_log(S_MISC, "'Z' specifier within format string");
4712 zvp = (zval*) va_arg(ap, zval*);
4713 zend_make_printable_zval(zvp, &zcopy, &free_zcopy);
4715 @@ -400,6 +404,7 @@ static void xbuf_format_converter(smart_
4716 if (adjust_precision && precision < s_len) {
4723 @@ -700,7 +705,11 @@ static void xbuf_format_converter(smart_
4728 + zend_suhosin_log(S_MISC, "'n' specifier within format string");
4730 *(va_arg(ap, int *)) = xbuf->len;
4736 +++ b/main/suhosin_globals.h
4739 + +----------------------------------------------------------------------+
4740 + | Suhosin-Patch for PHP |
4741 + +----------------------------------------------------------------------+
4742 + | Copyright (c) 2004-2009 Stefan Esser |
4743 + +----------------------------------------------------------------------+
4744 + | This source file is subject to version 2.02 of the PHP license, |
4745 + | that is bundled with this package in the file LICENSE, and is |
4746 + | available at through the world-wide-web at |
4747 + | http://www.php.net/license/2_02.txt. |
4748 + | If you did not receive a copy of the PHP license and are unable to |
4749 + | obtain it through the world-wide-web, please send a note to |
4750 + | license@php.net so we can mail you a copy immediately. |
4751 + +----------------------------------------------------------------------+
4752 + | Author: Stefan Esser <stefan.esser@sektioneins.de> |
4753 + +----------------------------------------------------------------------+
4756 +#ifndef SUHOSIN_GLOBALS_H
4757 +#define SUHOSIN_GLOBALS_H
4759 +typedef struct _suhosin_patch_globals suhosin_patch_globals_struct;
4762 +# define SPG(v) TSRMG(suhosin_patch_globals_id, suhosin_patch_globals_struct *, v)
4763 +extern int suhosin_patch_globals_id;
4765 +# define SPG(v) (suhosin_patch_globals.v)
4766 +extern struct _suhosin_patch_globals suhosin_patch_globals;
4770 +struct _suhosin_patch_globals {
4773 + int log_syslog_facility;
4774 + int log_syslog_priority;
4777 + int log_phpscript;
4778 + char *log_scriptname;
4779 + char *log_phpscriptname;
4780 + zend_bool log_phpscript_is_safe;
4781 + zend_bool log_use_x_forwarded_for;
4783 + /* memory manager canary protection */
4784 + unsigned int canary_1;
4785 + unsigned int canary_2;
4786 + unsigned int canary_3;
4787 + unsigned int dummy;
4791 +#endif /* SUHOSIN_GLOBALS_H */
4794 + * Local variables:
4796 + * c-basic-offset: 4
4800 +++ b/main/suhosin_logo.h
4802 +static unsigned char suhosin_logo[] =
4803 + "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48"
4804 + "\x00\x48\x00\x00\xff\xe1\x00\x16\x45\x78\x69\x66\x00\x00\x4d\x4d"
4805 + "\x00\x2a\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\xff\xdb\x00\x43"
4806 + "\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
4807 + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
4808 + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
4809 + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
4810 + "\x01\xff\xc0\x00\x0b\x08\x00\x27\x00\x71\x01\x01\x22\x00\xff\xc4"
4811 + "\x00\x1e\x00\x00\x02\x02\x02\x03\x01\x01\x00\x00\x00\x00\x00\x00"
4812 + "\x00\x00\x00\x00\x09\x06\x08\x05\x07\x02\x03\x0a\x01\x04\xff\xc4"
4813 + "\x00\x32\x10\x00\x01\x04\x03\x00\x02\x00\x05\x01\x05\x09\x01\x00"
4814 + "\x00\x00\x00\x05\x02\x03\x04\x06\x01\x07\x08\x00\x09\x11\x12\x13"
4815 + "\x14\x21\x15\x0a\x16\x31\x56\x96\x17\x18\x19\x23\x32\x41\x58\x98"
4816 + "\xd4\xd6\xff\xda\x00\x08\x01\x01\x00\x00\x3f\x00\xf4\xc1\xe1\xe5"
4817 + "\x69\xe9\x3e\xb9\xd1\x7c\x8a\x2e\x9d\x66\xe8\x3b\x29\x4d\x7f\x46"
4818 + "\xba\x58\x55\x54\x8d\xb1\x5f\xaa\xd9\x8d\x51\x2b\xb6\x27\x5a\x69"
4819 + "\xd1\x43\xaf\x16\x1a\xf0\xb2\xb1\xe9\x6d\x9f\xc2\xa4\x36\x18\xb5"
4820 + "\x85\x10\x41\xbe\xfc\x09\xac\x49\x29\x11\xd4\x32\x97\xec\x08\x13"
4821 + "\xc1\x2d\x20\xc3\x59\xeb\x26\x05\xd8\x6b\x76\x31\x43\x8f\x57\xcf"
4822 + "\x84\x9f\x14\xa8\x53\x81\x0b\xc3\x64\x80\xa3\x02\x0a\x41\x75\xf8"
4823 + "\x44\x85\x93\x81\x22\x3c\xd8\x13\xe1\xbe\xf4\x59\x91\x1f\x6a\x44"
4824 + "\x77\x5c\x69\xc4\x2f\x39\x5f\x0f\x2a\x8d\xeb\xba\xf8\xc3\x56\x6c"
4825 + "\x3b\x36\xa7\xda\xbd\x4d\xa1\xb5\x4e\xc6\xa7\xa4\x3a\xec\x15\x2d"
4826 + "\xa5\xb3\xea\x5a\xdc\xac\x46\xac\x01\x60\xd8\x43\xc8\x8e\x8b\xb1"
4827 + "\x40\x4c\x95\x8b\x34\x41\x28\x52\x91\x28\x43\xd3\xa3\xb6\xa7\x55"
4828 + "\x15\xe7\x5a\x96\xcb\xf1\xda\xe5\x55\xee\xfe\x1e\xbd\xd9\x41\xd3"
4829 + "\x28\xfd\x97\xca\x57\x2b\x85\x9c\xa4\x30\x95\xaa\xa5\x57\xa2\x35"
4830 + "\x15\x86\xcb\x61\x34\x41\xe4\xc7\x80\x20\x18\x21\x17\x09\x85\x0b"
4831 + "\x14\x9d\x21\x68\x62\x1c\x08\x11\x64\x4b\x92\xf2\xd2\xd3\x2d\x2d"
4832 + "\x6a\xc2\x73\x6b\x3c\x3c\x8b\x9e\xbc\x52\xaa\xa4\xab\x81\x6c\xf6"
4833 + "\xfa\xbd\x70\xc5\xc6\x7b\xc2\xaa\x22\x4f\x58\x04\x87\x25\x6a\x27"
4834 + "\x1d\xa4\x3d\x20\x75\x72\x01\x09\x71\xe5\x1c\x9e\xc3\x2e\x36\xf3"
4835 + "\xd0\xc6\x35\x2a\x43\x4d\x2d\x0e\x2d\xb4\xa1\x49\xce\x65\x1e\x52"
4836 + "\x9e\xa1\xf6\x09\xcc\xdc\x63\x66\xa8\x01\xe9\x3b\x0d\xd7\x5a\x85"
4837 + "\xbb\xc5\x65\xc0\x7b\x2e\x46\xa9\xd9\x56\x1d\x4c\x92\x72\x26\x4e"
4838 + "\x86\xd5\x68\xae\xc4\xaa\x55\xce\xd7\x83\x59\xb3\x81\xee\xce\x74"
4839 + "\x39\x39\x31\x9f\x8a\x25\xe8\xa5\xa5\xe5\x81\xf2\x11\x23\xcb\xa1"
4840 + "\x1e\x43\x12\xe3\xb1\x2a\x2b\xcd\xc8\x8d\x25\x96\xa4\x47\x7d\x95"
4841 + "\xa5\xc6\x9f\x61\xe4\x25\xc6\x5e\x69\xc4\xe7\x29\x5b\x6e\xb6\xa4"
4842 + "\xad\x0b\x4e\x72\x95\x25\x58\x56\x33\x9c\x67\xce\xef\x0f\x17\xbf"
4843 + "\x4c\x7b\x2d\xe6\xfe\x76\x35\x27\x5a\x07\x97\x67\xe8\xae\x8d\x71"
4844 + "\x0f\xb2\x13\x99\xb9\xbc\x14\xad\xb3\xb7\xe6\x11\x6f\xe0\xda\x58"
4845 + "\xb1\x08\xac\xa6\x6c\x2d\x7f\x05\xb7\x56\xd2\xe6\xcf\xbb\x4d\x0c"
4846 + "\xe3\x50\xb2\xec\x91\xf0\x4a\xb8\xd6\x22\xb8\xa7\xf6\x67\xaf\xcf"
4847 + "\x63\x7e\xd7\xe7\x42\xd8\xbd\xc3\x71\xa1\xf2\x7e\x9b\xa8\x97\x83"
4848 + "\x6e\xd1\xdc\x4b\x06\x11\x2d\xae\x26\x61\x98\x72\x10\xf4\x42\x5d"
4849 + "\x20\x4a\xa3\x73\xd7\xf2\xcd\x3c\x48\x32\xe4\x03\x9f\x80\x37\x08"
4850 + "\x36\x11\xd0\xcb\x97\x6c\x08\xed\x6d\x33\x24\xa2\x1b\xb4\x77\xdf"
4851 + "\x61\x5d\x5f\xc1\x43\xc2\x82\xeb\x0f\x5d\x84\x08\x68\xaa\xa4\x01"
4852 + "\xe1\x19\xdf\xbc\x31\x65\xfe\xd1\xf5\x7d\x7a\xb2\x2a\x33\x50\x21"
4853 + "\x2a\x56\x9d\xb1\x81\xab\xdb\x35\x78\x30\x83\xd9\x89\x1d\x31\xac"
4854 + "\x96\x14\x07\x61\xbc\x20\x68\x42\x85\x33\x19\xac\xbe\xdb\x34\x56"
4855 + "\xf1\xd5\xfd\x29\xa9\x28\xdb\xcb\x4c\x5a\x23\xdc\xf5\x96\xc5\x10"
4856 + "\xa3\x35\x5b\x14\x68\xd3\x61\x62\x64\x76\x26\xcb\x17\x3e\x34\x98"
4857 + "\x04\xa3\xc4\x20\x38\x90\x92\xe3\xc8\x07\x2c\x36\x74\x66\x26\x0e"
4858 + "\x29\x02\x64\x29\x2d\x21\xe6\x16\x9c\x6b\xce\xa3\x89\xd9\x4f\xd3"
4859 + "\xc4\xbd\xc5\x87\x79\x9c\x65\xf6\x39\x45\x60\xe8\xce\x9e\xab\x6d"
4860 + "\x13\x15\x22\xe1\x5e\x4b\x38\x42\xc4\x1e\xd5\x76\xe0\xc5\xeb\x85"
4861 + "\x07\x2d\x0f\xb8\xb6\xa6\xd6\x6d\x71\x0d\xa2\x43\x4c\x25\xea\xfa"
4862 + "\xa1\xae\x4c\xe4\x7d\xbd\x76\xa9\xfb\x06\xc2\x83\x42\xeb\xad\xe7"
4863 + "\xe9\x5f\x68\x6f\xba\xfb\x2f\x07\xce\xb8\x13\xc1\x9b\xeb\xb0\x76"
4864 + "\x45\x57\x28\x7b\xea\xbe\x0f\xf4\x30\x7b\xa0\xed\xe4\x22\x93\x21"
4865 + "\xfc\xbc\xe0\xb9\x75\xc1\x4f\xfc\xef\xb6\xfa\xa1\xfc\x64\xa1\x4a"
4866 + "\x82\xc7\x33\xad\x75\xed\x82\xbd\x3d\xdb\xf7\xa8\xbe\x5e\xbb\x36"
4867 + "\x62\x04\x9a\x2e\xc5\xd9\x9e\x9c\x3a\x0b\x98\x0b\x57\xac\xf1\x24"
4868 + "\x62\x58\x83\x15\x5b\xa6\xf2\xda\x34\x70\x03\xce\x0f\x93\x1b\x12"
4869 + "\xc7\xce\x54\x87\x33\x15\xd6\x53\x25\x1f\x2a\x90\x87\x12\xe3\x78"
4870 + "\xef\x55\x77\x4d\x4a\xd8\x7e\xef\xd2\xfd\xd1\xaf\x3a\xaf\x55\xdb"
4871 + "\x6a\x2d\x3d\x42\xac\x51\x79\xee\x91\xab\xe1\x05\x2d\x3c\x80\xa2"
4872 + "\x43\xad\x22\x2e\xd5\x33\x13\xa4\x9e\x00\xe0\x04\x10\x84\xc8\xf2"
4873 + "\x19\x30\x92\x1f\xaa\xc3\x28\xc9\x76\x30\x3f\xe9\x10\x61\x5e\x79"
4874 + "\xd5\xf7\xdf\xd0\x54\xdb\xae\xb6\xae\xfa\xe8\xa3\x57\xe0\x6c\x2d"
4875 + "\xf7\xbd\x49\xd6\x6e\x76\x79\xcc\x54\x0c\x5f\xff\x00\xbb\x06\x98"
4876 + "\xa6\x9e\x89\x61\xb4\x6f\xc3\xe3\x6a\xc2\x4f\x59\x03\xc9\x80\x2c"
4877 + "\x59\x24\x44\x70\x38\xd5\x96\x6a\x9e\x8b\x81\x64\xe5\xbc\xa0\x3c"
4878 + "\x33\xaf\x17\x9d\xff\x00\x71\x1a\xd1\x3a\x80\x66\xb3\xd9\x31\x77"
4879 + "\x0d\x12\xbd\xae\x29\xb5\x6a\xd6\xcf\x8d\x68\x87\x75\xcd\xe8\x65"
4880 + "\x5a\xbe\x3c\x04\x7b\x34\xdb\x54\x19\xa4\x63\x9c\x2a\x5d\x23\xbe"
4881 + "\xf4\xb1\x1c\x4d\x90\xec\x92\x2f\x49\x71\xf7\x14\xf2\x97\x9f\x15"
4882 + "\x57\xed\x13\x21\x2a\xf5\x33\xd1\x2a\x52\x52\xac\xb7\x62\xd1\xcb"
4883 + "\x46\x73\x8c\x67\x28\x56\x77\x86\xbf\x6f\x2a\x4e\x73\xfe\x95\x65"
4884 + "\x0b\x5a\x3e\x38\xfc\xfc\xaa\x56\x3f\x86\x73\xe3\xb9\x4a\x52\x84"
4885 + "\xa5\x08\x4e\x12\x94\x27\x09\x4a\x53\x8c\x61\x29\x4a\x71\xf0\x4a"
4886 + "\x53\x8c\x7e\x31\x8c\x63\x18\xc6\x31\x8f\xc6\x31\xf8\xc7\x9f\x7c"
4887 + "\xd5\xbb\xae\x5e\xe2\x1f\xab\x6e\x24\x34\x00\x8a\x25\x83\x70\x40"
4888 + "\x1c\xcc\xda\x45\x7f\x66\x4e\x30\x2e\x94\x7e\x74\x49\xf0\xe4\x4e"
4889 + "\x06\x5c\xa8\x2f\x89\x21\x2e\x98\x0e\xd9\x21\xc2\x0b\x21\x0f\xc4"
4890 + "\x16\x6e\x48\xd9\xe4\xe3\x4a\x19\x1e\x64\x67\x54\xff\x00\x3a\x6d"
4891 + "\x4f\x62\xb5\x00\x4a\xaa\x51\xfd\x2d\xe8\x0e\x6c\xaf\xc6\x7d\x6d"
4892 + "\xc8\x88\xc7\x67\xea\x8a\x58\x02\x73\xe3\x65\x4d\xc9\x24\xc0\x3d"
4893 + "\x57\xa3\x2e\x53\x16\x99\x4f\xe5\xe7\x19\x97\x3e\x3b\xcf\xc9\x4b"
4894 + "\x99\x7f\x33\x25\xa5\xdf\xba\x77\x2b\xd3\x3e\xc2\x7b\x8b\x94\x07"
4895 + "\xe9\x52\x5b\x43\x87\x34\x14\x86\x37\xcf\x41\x6b\x8e\x6a\xa5\x22"
4896 + "\xab\xdb\x96\xa2\xcf\x46\xd8\x9b\x45\x93\xef\xd6\xdf\x3e\x99\x9c"
4897 + "\x7e\x29\x10\x6b\x6c\xa2\xb8\x43\x05\x09\x44\x70\x8c\xb8\xaa\x54"
4898 + "\x7c\x30\x36\x5e\x1c\x5e\x5b\x9f\x6c\x0d\x81\xee\xa0\x93\x8d\x67"
4899 + "\x55\xf3\x87\xaf\xaa\x6b\x58\xf9\xbe\xb2\x36\x07\x42\x6e\xbd\x96"
4900 + "\xe3\x9f\x1f\x8f\xc9\xf4\x9d\xae\x6a\x7d\x4c\x96\xbe\x5f\xc7\xcd"
4901 + "\xf3\xb2\xf7\xcd\xf0\xcf\xc3\xe4\xf8\xfe\x37\x4f\x1c\x4d\xf6\x40"
4902 + "\xf1\x6b\x7c\x4e\xe0\xa6\x71\xad\x56\xa7\x1c\x5c\x15\x6b\xfc\xf3"
4903 + "\x01\x5d\xac\xf1\x75\x9a\x72\x6b\xaa\x28\xc5\x88\x6d\xfb\x33\x85"
4904 + "\xe0\x4e\x61\xab\xeb\x31\x2c\x71\x08\x73\x11\x3b\xfc\xb5\xc0\x96"
4905 + "\xcc\x87\x24\x44\xb5\x9b\x9e\xb3\x71\xba\xe9\xed\xb1\x4e\xd7\x76"
4906 + "\x6c\xd2\xb6\x05\xb7\x5a\xde\xeb\x34\x5b\x96\x16\xfb\x59\xa9\x5c"
4907 + "\x4f\x55\xca\x8a\xac\x59\xb0\xe4\x54\x39\x25\xbc\x81\x37\x2a\x09"
4908 + "\x5f\x9e\x3b\x6b\x7d\x1f\x69\xf3\x34\x85\x39\x84\xa7\x28\x0b\xd3"
4909 + "\xfd\xfb\x4b\x7a\xea\xe7\xd2\x3c\xd3\xda\x15\x68\xbc\x73\xd3\x22"
4910 + "\x6f\xd7\x72\x5b\x2b\x66\xee\xa8\x0d\x54\xe8\x5b\xf9\x92\x96\x92"
4911 + "\x93\xea\x97\x4a\xc7\x43\x10\x46\x35\xc5\xc0\x60\x8a\xe4\xc1\xb5"
4912 + "\x36\xc6\xae\xed\xf7\x70\xa5\x86\x99\x3d\x91\xf8\xfd\x4e\x53\xeb"
4913 + "\xbb\xbd\x6d\xec\x8f\xd7\x89\x3d\x31\x7f\xd7\x78\xba\x50\xbb\x74"
4914 + "\x9d\xf6\xac\x4e\xb9\x03\x9c\x79\xd5\xe1\xbd\x17\x68\xd9\x13\x0b"
4915 + "\x45\x75\x88\x00\x1d\x1f\xae\x73\x6a\x1d\x5c\x6e\x44\x9f\xa6\xfa"
4916 + "\x4e\xd8\x25\x8b\xc0\xbc\xb2\x99\xe3\x17\x24\xb3\x23\xe2\x48\x8b"
4917 + "\xfa\x22\xe7\x7e\x8f\xe6\x3f\x5f\x55\x0d\x75\xd3\x51\x0b\xd7\xed"
4918 + "\xd3\x6f\x97\x3b\x85\x42\x80\x7e\x5f\xdc\x1b\xd6\xba\xee\xc4\x80"
4919 + "\xce\x06\xa9\x15\x8c\x97\x5f\x40\x69\xb2\x4d\xc5\xb2\x5c\x1e\x01"
4920 + "\x87\x7e\xe0\x36\x6d\x78\x80\x4e\x3c\x02\xec\x90\x1d\x11\x81\x74"
4921 + "\xa5\x8b\xa4\xa0\x56\x06\xd5\x79\x72\x85\x57\x3b\xb2\x2e\xae\x90"
4922 + "\x18\x8d\x91\xb2\x0e\x44\x19\xaa\xb4\xcc\x08\xed\x46\xfa\xd7\x2b"
4923 + "\x78\x58\x72\x5d\xbb\x5e\x49\xe7\xee\xf3\x8a\x9d\x22\xa4\x19\xc8"
4924 + "\xe7\x08\xc3\x90\x9b\x35\x9a\xa4\x25\x8c\x4b\x9b\xa7\xf8\xbf\x81"
4925 + "\xf5\xdf\x22\x66\xf1\x7e\x9f\x66\x3d\xbb\xfa\x73\x73\x4d\xfd\x67"
4926 + "\x7b\xf4\xce\xc3\x62\x2e\x6f\xbb\x0c\xa2\xdc\x69\xfc\x8a\x17\x0e"
4927 + "\x3a\x9e\x83\x46\xd7\xe3\x5e\x65\x86\xc0\x51\x00\xbb\x91\xe3\xe1"
4928 + "\xc1\x16\xc4\xe9\x65\x5c\x14\x3e\x44\x6a\x6b\xd1\x1e\xb0\x36\xdd"
4929 + "\x0b\x7d\x8a\xeb\xaf\x58\x5b\x64\x3f\x38\xed\x52\x76\xe8\x46\xf7"
4930 + "\x86\x84\xb3\x93\xb1\x0b\xe5\xfd\xfd\x0d\xe9\x6d\xe4\xf1\x1b\x1d"
4931 + "\x56\xb4\x34\xe4\x6a\xf5\xa4\x9c\x2c\xc9\x64\x94\xc1\xf5\x79\x6d"
4932 + "\x12\x96\xf3\x47\xc5\x48\xa8\xdb\xd8\x95\x64\x29\xcf\xf6\x88\xf1"
4933 + "\x95\x7a\x98\xe8\xbc\x27\x19\xce\x73\x61\xd1\xb8\xc6\x31\x8c\xe7"
4934 + "\x39\xce\x77\x9e\xbc\xc6\x31\x8c\x63\xf3\x9c\xe7\x39\xc6\x31\x8f"
4935 + "\xf7\xce\x7e\x1e\x3b\x7f\x0f\x0f\x0f\x13\x57\xb9\x0a\xe1\x0b\x64"
4936 + "\x5f\x58\x40\xc6\xc7\x7a\x4b\xf2\x3d\xbc\x71\xf4\xa7\xd2\xca\x14"
4937 + "\xe2\x98\x1a\x30\x1e\xe0\x26\x5a\x6a\xf0\x9c\x67\x38\x66\x00\xb8"
4938 + "\x72\xe6\xbe\xac\xfe\x12\xd3\x0b\x56\x73\x8c\x63\xc7\x2b\xe1\xe2"
4939 + "\xe8\xdd\x7b\xff\x00\xd8\xe5\x23\x6c\xce\xa8\x69\xcf\x5e\x3a\xef"
4940 + "\x77\xea\xe5\xab\x0e\x82\xdb\xd9\xed\x7a\x9e\xb8\x6d\x51\x32\xdb"
4941 + "\x79\xc3\x36\x9a\x2d\xa3\x50\x39\x65\x0a\x63\x0e\xe5\xd4\x39\x12"
4942 + "\xbf\x8b\x98\xa4\xa1\x2d\xad\xb3\xcf\x65\x6a\x43\x78\xb3\x3b\x07"
4943 + "\xd8\xd5\xea\xae\x76\xad\x6f\xf5\xff\x00\xca\x93\xab\x96\xb0\x64"
4944 + "\xeb\xd6\x4a\xd5\x87\xba\xec\x24\x60\x97\x06\x76\x03\xe3\x4c\x07"
4945 + "\x29\x11\x8e\x34\x25\x02\x64\x29\xf0\x25\x48\x85\x3a\x33\x8b\x7a"
4946 + "\x3c\x86\x1e\x75\xa5\x61\xc6\x97\x9f\x8d\x25\xf5\xc9\xcd\xde\xc9"
4947 + "\x7d\x77\xf2\xc8\x7e\x70\xaf\x73\x5f\x2d\xec\xa2\x51\x2d\x96\xfb"
4948 + "\x89\xad\x80\x57\xb2\x36\x1d\x7d\x83\x45\xac\xf3\xdb\xcc\x6c\x31"
4949 + "\x4f\xcf\x30\x58\xd0\x12\x28\x90\x50\x42\x86\xfb\x48\x16\x3c\xc5"
4950 + "\x9c\xf8\xe7\xcc\x29\x88\xb3\x4a\x4b\x4e\x6c\xbc\xdb\xc7\xbb\xe9"
4951 + "\xb6\xa0\x8b\x11\xa1\x7d\x73\xd7\xe9\xbf\x7e\xc2\x6c\x10\x8d\xee"
4952 + "\x9d\xef\x63\x3a\xe0\xf5\xbe\x8c\x3e\xa1\xc7\xc5\xd1\x00\x44\x1e"
4953 + "\xf3\x51\xf2\xe2\xb0\xe3\xb5\x13\x7f\x32\xf1\x8c\xa6\x22\xfe\x1f"
4954 + "\x49\x4d\xbb\xcf\x3a\x5d\xed\x4c\xd2\xfc\x85\xed\x23\xd6\xc7\x50"
4955 + "\xb6\x5b\x3a\x16\x83\xb8\x6f\xfd\x32\x3f\xaa\x36\x34\xbb\xf5\x96"
4956 + "\xa9\xab\xcf\x9f\x8f\xac\xc3\xca\xd5\x8b\xd8\x48\x9e\x79\xaa\x30"
4957 + "\x87\xca\x58\x4d\x59\x96\xb9\x4f\xc5\x1b\x1c\xd2\xda\x5b\xe6\x57"
4958 + "\x29\xa1\x28\x7a\x2b\x5b\xff\x00\x12\x2f\x5e\x3f\xf3\xbb\x8e\x7f"
4959 + "\xec\xc6\x98\xff\x00\xed\x3c\xa6\xdd\xa9\xdc\x7e\xa0\xf7\xd6\x99"
4960 + "\x31\xa2\xf7\xaf\x6b\xe9\x82\x74\x4b\x3d\x8f\x5e\x58\x0b\x33\xab"
4961 + "\xef\xc3\xaf\x84\x64\xb9\xae\xb6\x25\x5f\x62\x8f\x1c\xe3\xf4\x51"
4962 + "\xb7\x96\xe3\x0e\x30\x42\xa9\x18\x39\xbf\x9e\x2a\x1f\x74\x19\x02"
4963 + "\x2d\x43\x93\x06\x63\xb1\xa7\x47\x6a\xfa\x9b\x6c\xeb\xbd\xe9\xae"
4964 + "\x6a\x7b\x6f\x53\x5a\x60\x5d\xb5\xcd\xe8\x67\xeb\x35\x3b\x48\xc6"
4965 + "\xa6\xb3\x04\xc8\xdf\xb8\x7e\x26\x64\xb0\xc9\x18\xb0\xa7\x33\xf2"
4966 + "\x4a\x8b\x22\x3b\x8d\x4b\x89\x1d\xf6\x9d\x65\xc4\x38\xd2\x54\x9c"
4967 + "\xe3\xcd\x89\xe1\xe1\xe6\x3e\x70\x81\x45\x1d\x18\xf9\x31\x83\xc8"
4968 + "\xbe\x14\x82\x4b\x87\x7a\x74\x28\xd2\xdd\x12\x55\x30\xe6\x0e\x49"
4969 + "\x31\x8e\x48\x69\xc5\xc0\x20\x91\xe4\x48\x41\x4c\xd8\xb9\x6a\x4e"
4970 + "\x21\xce\x99\x1b\x0e\xfd\x09\x4f\xa1\x79\x0f\x0f\x0f\x0f\x0f\x0f"
4971 + "\x0f\x3f\x3c\xb8\x71\x27\xc7\x72\x24\xe8\xb1\xa6\xc5\x7b\x18\xc3"
4972 + "\xb1\xa5\xb0\xd4\x98\xee\xe3\x19\xc6\x71\x87\x19\x79\x2b\x6d\x78"
4973 + "\xc6\x71\x8c\xe3\x0a\x4e\x71\x8c\xe3\x19\xfe\x38\xf2\x3b\xfb\x8b"
4974 + "\x48\xfe\x4e\xaa\xff\x00\x4f\x08\xff\x00\xc7\xe1\xfb\x8b\x48\xfe"
4975 + "\x4e\xaa\xff\x00\x4f\x08\xff\x00\xc7\xe4\x95\x86\x18\x8a\xcb\x31"
4976 + "\xa3\x32\xd4\x78\xf1\xdb\x43\x2c\x47\x61\xb4\x32\xcb\x2c\xb4\x9c"
4977 + "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1"
4978 + "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9"
4981 +++ b/main/suhosin_patch.c
4984 + +----------------------------------------------------------------------+
4985 + | Suhosin Patch for PHP |
4986 + +----------------------------------------------------------------------+
4987 + | Copyright (c) 2004-2010 Stefan Esser |
4988 + +----------------------------------------------------------------------+
4989 + | This source file is subject to version 2.02 of the PHP license, |
4990 + | that is bundled with this package in the file LICENSE, and is |
4991 + | available at through the world-wide-web at |
4992 + | http://www.php.net/license/2_02.txt. |
4993 + | If you did not receive a copy of the PHP license and are unable to |
4994 + | obtain it through the world-wide-web, please send a note to |
4995 + | license@php.net so we can mail you a copy immediately. |
4996 + +----------------------------------------------------------------------+
4997 + | Author: Stefan Esser <sesser@hardened-php.net> |
4998 + +----------------------------------------------------------------------+
5000 +/* $Id: suhosin_patch.c,v 1.2 2004/11/21 09:38:52 ionic Exp $ */
5005 +#include <stdlib.h>
5006 +#include <sys/mman.h>
5009 +#include <unistd.h>
5012 +#include "php_globals.h"
5016 +#ifdef HAVE_SYS_SOCKET_H
5017 +#include <sys/socket.h>
5020 +#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE)
5024 +#if defined(AF_UNIX)
5025 +#include <sys/un.h>
5028 +#define SYSLOG_PATH "/dev/log"
5031 +static HANDLE log_source = 0;
5034 +#include "snprintf.h"
5036 +#include "suhosin_patch.h"
5039 +#include "suhosin_globals.h"
5040 +int suhosin_patch_globals_id;
5042 +struct _suhosin_patch_globals suhosin_patch_globals;
5045 +static char *suhosin_config = NULL;
5047 +static zend_intptr_t SUHOSIN_POINTER_GUARD = 0;
5049 +static void php_security_log(int loglevel, char *fmt, ...);
5051 +static void suhosin_patch_globals_ctor(suhosin_patch_globals_struct *suhosin_patch_globals TSRMLS_DC)
5053 + memset(suhosin_patch_globals, 0, sizeof(*suhosin_patch_globals));
5056 +ZEND_API char suhosin_get_config(int element)
5058 + return ((char *)SUHOSIN_MANGLE_PTR(suhosin_config))[element];
5061 +static void suhosin_set_config(int element, char value)
5063 + ((char *)SUHOSIN_MANGLE_PTR(suhosin_config))[element] = value;
5066 +static void suhosin_read_configuration_from_environment()
5070 + /* check if canary protection should be activated or not */
5071 + tmp = getenv("SUHOSIN_MM_USE_CANARY_PROTECTION");
5072 + /* default to activated */
5073 + suhosin_set_config(SUHOSIN_MM_USE_CANARY_PROTECTION, 1);
5075 + int flag = zend_atoi(tmp, 0);
5076 + suhosin_set_config(SUHOSIN_MM_USE_CANARY_PROTECTION, flag);
5079 + /* check if free memory should be overwritten with 0xFF or not */
5080 + tmp = getenv("SUHOSIN_MM_DESTROY_FREE_MEMORY");
5081 + /* default to deactivated */
5082 + suhosin_set_config(SUHOSIN_MM_DESTROY_FREE_MEMORY, 0);
5084 + int flag = zend_atoi(tmp, 0);
5085 + suhosin_set_config(SUHOSIN_MM_DESTROY_FREE_MEMORY, flag);
5088 + /* check if canary violations should be ignored */
5089 + tmp = getenv("SUHOSIN_MM_IGNORE_CANARY_VIOLATION");
5090 + /* default to NOT ignore */
5091 + suhosin_set_config(SUHOSIN_MM_IGNORE_CANARY_VIOLATION, 0);
5093 + int flag = zend_atoi(tmp, 0);
5094 + suhosin_set_config(SUHOSIN_MM_IGNORE_CANARY_VIOLATION, flag);
5097 + /* check if invalid hashtable destructors should be ignored */
5098 + tmp = getenv("SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR");
5099 + /* default to NOT ignore */
5100 + suhosin_set_config(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR, 0);
5102 + int flag = zend_atoi(tmp, 0);
5103 + suhosin_set_config(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR, flag);
5106 + /* check if invalid linkedlist destructors should be ignored */
5107 + tmp = getenv("SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR");
5108 + /* default to NOT ignore */
5109 + suhosin_set_config(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR, 0);
5111 + int flag = zend_atoi(tmp, 0);
5112 + suhosin_set_config(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR, flag);
5115 + suhosin_set_config(SUHOSIN_CONFIG_SET, 1);
5118 +static void suhosin_write_protect_configuration()
5120 + /* check return value of mprotect() to ensure memory is read only now */
5121 + if (mprotect(SUHOSIN_MANGLE_PTR(suhosin_config), sysconf(_SC_PAGESIZE), PROT_READ) != 0) {
5122 + perror("suhosin");
5127 +PHPAPI void suhosin_startup()
5130 + ts_allocate_id(&suhosin_patch_globals_id, sizeof(suhosin_patch_globals_struct), (ts_allocate_ctor) suhosin_patch_globals_ctor, NULL);
5132 + suhosin_patch_globals_ctor(&suhosin_patch_globals TSRMLS_CC);
5134 + zend_suhosin_log = php_security_log;
5136 + /* get the pointer guardian and ensure low 3 bits are 1 */
5137 + if (SUHOSIN_POINTER_GUARD == 0) {
5138 + zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD));
5139 + SUHOSIN_POINTER_GUARD |= 7;
5142 + if (!suhosin_config) {
5143 +#ifndef MAP_ANONYMOUS
5144 +#define MAP_ANONYMOUS MAP_ANON
5146 + suhosin_config = mmap(NULL, sysconf(_SC_PAGESIZE), PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
5147 + if (suhosin_config == MAP_FAILED) {
5148 + perror("suhosin");
5151 + suhosin_config = SUHOSIN_MANGLE_PTR(suhosin_config);
5153 + if (!SUHOSIN_CONFIG(SUHOSIN_CONFIG_SET)) {
5154 + suhosin_read_configuration_from_environment();
5155 + suhosin_write_protect_configuration();
5159 +static char *loglevel2string(int loglevel)
5161 + switch (loglevel) {
5175 + return "EXECUTOR";
5183 +static void php_security_log(int loglevel, char *fmt, ...)
5186 +#if defined(AF_UNIX)
5187 + struct sockaddr_un saun;
5191 + unsigned short etype;
5194 + char buf[4096+64];
5195 + char error[4096+100];
5198 + char *alertstring;
5203 + /*SDEBUG("(suhosin_log) loglevel: %d log_syslog: %u - log_sapi: %u - log_script: %u", loglevel, SPG(log_syslog), SPG(log_sapi), SPG(log_script));*/
5205 + if (SPG(log_use_x_forwarded_for)) {
5206 + ip_address = sapi_getenv("HTTP_X_FORWARDED_FOR", 20 TSRMLS_CC);
5207 + if (ip_address == NULL) {
5208 + ip_address = "X-FORWARDED-FOR not set";
5211 + ip_address = sapi_getenv("REMOTE_ADDR", 11 TSRMLS_CC);
5212 + if (ip_address == NULL) {
5213 + ip_address = "REMOTE_ADDR not set";
5218 + va_start(ap, fmt);
5219 + ap_php_vsnprintf(error, sizeof(error), fmt, ap);
5221 + while (error[i]) {
5222 + if (error[i] < 32) error[i] = '.';
5226 +/* if (SPG(simulation)) {
5227 + alertstring = "ALERT-SIMULATION";
5229 + alertstring = "ALERT";
5232 + if (zend_is_executing(TSRMLS_C)) {
5233 + if (EG(current_execute_data)) {
5234 + lineno = EG(current_execute_data)->opline->lineno;
5235 + fname = EG(current_execute_data)->op_array->filename;
5237 + lineno = zend_get_executed_lineno(TSRMLS_C);
5238 + fname = zend_get_executed_filename(TSRMLS_C);
5240 + ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s', line %u)", alertstring, error, ip_address, fname, lineno);
5242 + fname = sapi_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
5243 + if (fname==NULL) {
5244 + fname = "unknown";
5246 + ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s')", alertstring, error, ip_address, fname);
5249 + /* Syslog-Logging disabled? */
5250 + if (((SPG(log_syslog)|S_INTERNAL) & loglevel)==0) {
5254 +#if defined(AF_UNIX)
5255 + ap_php_snprintf(error, sizeof(error), "<%u>suhosin[%u]: %s\n", (unsigned int)(SPG(log_syslog_facility)|SPG(log_syslog_priority)),getpid(),buf);
5257 + s = socket(AF_UNIX, SOCK_DGRAM, 0);
5262 + memset(&saun, 0, sizeof(saun));
5263 + saun.sun_family = AF_UNIX;
5264 + strcpy(saun.sun_path, SYSLOG_PATH);
5265 + /*saun.sun_len = sizeof(saun);*/
5267 + r = connect(s, (struct sockaddr *)&saun, sizeof(saun));
5270 + s = socket(AF_UNIX, SOCK_STREAM, 0);
5275 + memset(&saun, 0, sizeof(saun));
5276 + saun.sun_family = AF_UNIX;
5277 + strcpy(saun.sun_path, SYSLOG_PATH);
5278 + /*saun.sun_len = sizeof(saun);*/
5280 + r = connect(s, (struct sockaddr *)&saun, sizeof(saun));
5286 + send(s, error, strlen(error), 0);
5291 + ap_php_snprintf(error, sizeof(error), "suhosin[%u]: %s", getpid(),buf);
5293 + switch (SPG(log_syslog_priority)) { /* translate UNIX type into NT type */
5294 + case 1: /*LOG_ALERT:*/
5295 + etype = EVENTLOG_ERROR_TYPE;
5297 + case 6: /*LOG_INFO:*/
5298 + etype = EVENTLOG_INFORMATION_TYPE;
5301 + etype = EVENTLOG_WARNING_TYPE;
5305 + /* report the event */
5306 + if (log_source == NULL) {
5307 + log_source = RegisterEventSource(NULL, "Suhosin-Patch-" SUHOSIN_PATCH_VERSION);
5309 + ReportEvent(log_source, etype, (unsigned short) SPG(log_syslog_priority), evid, NULL, 1, 0, strs, NULL);
5313 + /* SAPI Logging activated? */
5314 + /*SDEBUG("(suhosin_log) log_syslog: %u - log_sapi: %u - log_script: %u - log_phpscript: %u", SPG(log_syslog), SPG(log_sapi), SPG(log_script), SPG(log_phpscript));*/
5315 + if (((SPG(log_sapi)|S_INTERNAL) & loglevel)!=0) {
5316 + sapi_module.log_message(buf);
5320 + /* script logging activaed? */
5321 + if (((SPG(log_script) & loglevel)!=0) && SPG(log_scriptname)!=NULL) {
5322 + char cmd[8192], *cmdpos, *bufpos;
5326 + ap_php_snprintf(cmd, sizeof(cmd), "%s %s \'", SPG(log_scriptname), loglevel2string(loglevel));
5327 + space = sizeof(cmd) - strlen(cmd);
5328 + cmdpos = cmd + strlen(cmd);
5330 + if (space <= 1) return;
5331 + while (space > 2 && *bufpos) {
5332 + if (*bufpos == '\'') {
5333 + if (space<=5) break;
5341 + *cmdpos++ = *bufpos++;
5348 + if ((in=VCWD_POPEN(cmd, "r"))==NULL) {
5349 + php_security_log(S_INTERNAL, "Unable to execute logging shell script: %s", SPG(log_scriptname));
5352 + /* read and forget the result */
5354 + int readbytes = fread(cmd, 1, sizeof(cmd), in);
5355 + if (readbytes<=0) {
5362 + if ((SPG(log_phpscript) & loglevel)!=0 && EG(in_execution) && SPG(log_phpscriptname) && SPG(log_phpscriptname)[0]) {
5363 + zend_file_handle file_handle;
5364 + zend_op_array *new_op_array;
5365 + zval *result = NULL;
5367 + /*long orig_execution_depth = SPG(execution_depth);*/
5368 + /*zend_bool orig_safe_mode = PG(safe_mode);*/
5369 + char *orig_basedir = PG(open_basedir);
5371 + char *phpscript = SPG(log_phpscriptname);
5372 +/*SDEBUG("scriptname %s", SPG(log_phpscriptname));`*/
5373 +#ifdef ZEND_ENGINE_2
5374 + if (zend_stream_open(phpscript, &file_handle TSRMLS_CC) == SUCCESS) {
5376 + if (zend_open(phpscript, &file_handle) == SUCCESS && ZEND_IS_VALID_FILE_HANDLE(&file_handle)) {
5377 + file_handle.filename = phpscript;
5378 + file_handle.free_filename = 0;
5380 + if (!file_handle.opened_path) {
5381 + file_handle.opened_path = estrndup(phpscript, strlen(phpscript));
5383 + new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE TSRMLS_CC);
5384 + zend_destroy_file_handle(&file_handle TSRMLS_CC);
5385 + if (new_op_array) {
5386 + HashTable *active_symbol_table = EG(active_symbol_table);
5387 + zval *zerror, *zerror_class;
5389 + if (active_symbol_table == NULL) {
5390 + active_symbol_table = &EG(symbol_table);
5392 + EG(return_value_ptr_ptr) = &result;
5393 + EG(active_op_array) = new_op_array;
5395 + MAKE_STD_ZVAL(zerror);
5396 + MAKE_STD_ZVAL(zerror_class);
5397 + ZVAL_STRING(zerror, buf, 1);
5398 + ZVAL_LONG(zerror_class, loglevel);
5400 + zend_hash_update(active_symbol_table, "SUHOSIN_ERROR", sizeof("SUHOSIN_ERROR"), (void **)&zerror, sizeof(zval *), NULL);
5401 + zend_hash_update(active_symbol_table, "SUHOSIN_ERRORCLASS", sizeof("SUHOSIN_ERRORCLASS"), (void **)&zerror_class, sizeof(zval *), NULL);
5403 + /*SPG(execution_depth) = 0;*/
5404 + if (SPG(log_phpscript_is_safe)) {
5405 + /*PG(safe_mode) = 0;*/
5406 + PG(open_basedir) = NULL;
5409 + zend_execute(new_op_array TSRMLS_CC);
5411 + /*SPG(execution_depth) = orig_execution_depth;*/
5412 + /*PG(safe_mode) = orig_safe_mode;*/
5413 + PG(open_basedir) = orig_basedir;
5415 +#ifdef ZEND_ENGINE_2
5416 + destroy_op_array(new_op_array TSRMLS_CC);
5418 + destroy_op_array(new_op_array);
5420 + efree(new_op_array);
5421 +#ifdef ZEND_ENGINE_2
5422 + if (!EG(exception))
5425 + if (EG(return_value_ptr_ptr)) {
5426 + zval_ptr_dtor(EG(return_value_ptr_ptr));
5427 + EG(return_value_ptr_ptr) = NULL;
5431 + php_security_log(S_INTERNAL, "Unable to execute logging PHP script: %s", SPG(log_phpscriptname));
5435 + php_security_log(S_INTERNAL, "Unable to execute logging PHP script: %s", SPG(log_phpscriptname));
5446 + * Local variables:
5448 + * c-basic-offset: 4
5450 + * vim600: sw=4 ts=4 fdm=marker
5451 + * vim<600: sw=4 ts=4
5454 +++ b/main/suhosin_patch.h
5457 + +----------------------------------------------------------------------+
5458 + | Suhosin Patch for PHP |
5459 + +----------------------------------------------------------------------+
5460 + | Copyright (c) 2004-2010 Stefan Esser |
5461 + +----------------------------------------------------------------------+
5462 + | This source file is subject to version 2.02 of the PHP license, |
5463 + | that is bundled with this package in the file LICENSE, and is |
5464 + | available at through the world-wide-web at |
5465 + | http://www.php.net/license/2_02.txt. |
5466 + | If you did not receive a copy of the PHP license and are unable to |
5467 + | obtain it through the world-wide-web, please send a note to |
5468 + | license@php.net so we can mail you a copy immediately. |
5469 + +----------------------------------------------------------------------+
5470 + | Author: Stefan Esser <stefan.esser@sektioneins.de> |
5471 + +----------------------------------------------------------------------+
5474 +#ifndef SUHOSIN_PATCH_H
5475 +#define SUHOSIN_PATCH_H
5481 +#define SUHOSIN_PATCH_VERSION "0.9.10"
5483 +#define SUHOSIN_LOGO_GUID "SUHO8567F54-D428-14d2-A769-00DA302A5F18"
5485 +#define SUHOSIN_CONFIG(idx) (suhosin_get_config(idx))
5487 +#define SUHOSIN_MM_USE_CANARY_PROTECTION 0
5488 +#define SUHOSIN_MM_DESTROY_FREE_MEMORY 1
5489 +#define SUHOSIN_MM_IGNORE_CANARY_VIOLATION 2
5490 +#define SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR 3
5491 +#define SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR 4
5493 +#define SUHOSIN_CONFIG_SET 100
5495 +#include <sys/types.h>
5496 +#include <sys/stat.h>
5497 +#include <sys/mman.h>
5499 +#if defined(DARWIN)
5500 +#include <mach/vm_param.h>
5503 +#define SUHOSIN_MANGLE_PTR(ptr) (ptr==NULL?NULL:((void *)((zend_intptr_t)(ptr)^SUHOSIN_POINTER_GUARD)))
5507 +#endif /* SUHOSIN_PATCH_H */
5510 + * Local variables:
5512 + * c-basic-offset: 4
5516 +++ b/main/suhosin_patch.m4
5519 +dnl $Id: suhosin_patch.m4,v 1.1 2004/11/14 13:24:24 ionic Exp $
5521 +dnl This file contains Suhosin Patch for PHP specific autoconf functions.
5524 +AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
5526 --- a/sapi/apache/mod_php5.c
5527 +++ b/sapi/apache/mod_php5.c
5528 @@ -965,7 +965,11 @@ static void php_init_handler(server_rec
5531 if (PG(expose_php)) {
5533 + ap_add_version_component("PHP/" PHP_VERSION " with Suhosin-Patch");
5535 ap_add_version_component("PHP/" PHP_VERSION);
5540 --- a/sapi/apache2filter/sapi_apache2.c
5541 +++ b/sapi/apache2filter/sapi_apache2.c
5542 @@ -581,7 +581,11 @@ static void php_apache_add_version(apr_p
5545 if (PG(expose_php)) {
5547 + ap_add_version_component(p, "PHP/" PHP_VERSION " with Suhosin-Patch");
5549 ap_add_version_component(p, "PHP/" PHP_VERSION);
5554 --- a/sapi/apache2handler/sapi_apache2.c
5555 +++ b/sapi/apache2handler/sapi_apache2.c
5556 @@ -406,7 +406,11 @@ static void php_apache_add_version(apr_p
5559 if (PG(expose_php)) {
5561 + ap_add_version_component(p, "PHP/" PHP_VERSION " with Suhosin-Patch");
5563 ap_add_version_component(p, "PHP/" PHP_VERSION);
5568 --- a/sapi/apache_hooks/mod_php5.c
5569 +++ b/sapi/apache_hooks/mod_php5.c
5570 @@ -1251,7 +1251,11 @@ static void php_init_handler(server_rec
5573 if (PG(expose_php)) {
5575 + ap_add_version_component("PHP/" PHP_VERSION " with Suhosin-Patch");
5577 ap_add_version_component("PHP/" PHP_VERSION);
5582 --- a/sapi/cgi/cgi_main.c
5583 +++ b/sapi/cgi/cgi_main.c
5584 @@ -2188,10 +2188,18 @@ consult the installation file that came
5585 SG(headers_sent) = 1;
5586 SG(request_info).no_headers = 1;
5590 - php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5591 + php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5593 - php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5594 + php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5598 + php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5600 + php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5603 php_request_shutdown((void *) 0);
5605 --- a/sapi/cli/php_cli.c
5606 +++ b/sapi/cli/php_cli.c
5607 @@ -687,7 +687,11 @@ static int do_cli(int argc, char **argv
5610 case 'v': /* show php version & quit */
5612 + php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) %s\nCopyright (c) 1997-2014 The PHP Group\n%s",
5614 php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2014 The PHP Group\n%s",
5616 PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,
5617 #if ZEND_DEBUG && defined(HAVE_GCOV)
5619 --- php-5.5.15/sapi/litespeed/lsapi_main.c 2014-08-21 11:45:02.000000000 +0300
5620 +++ php-5.5.15/sapi/litespeed/lsapi_main.c 2014-08-25 11:50:36.603155796 +0300
5621 @@ -734,11 +546,19 @@
5623 if (php_request_startup(TSRMLS_C) != FAILURE) {
5626 + php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5628 + php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5632 php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5634 php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5637 #ifdef PHP_OUTPUT_NEWAPI
5638 php_output_end_all(TSRMLS_C);
5640 php_end_ob_buffers(1 TSRMLS_CC);
5641 --- a/sapi/milter/php_milter.c
5642 +++ b/sapi/milter/php_milter.c
5643 @@ -1109,7 +1109,11 @@ int main(int argc, char *argv[])
5645 SG(headers_sent) = 1;
5646 SG(request_info).no_headers = 1;
5648 + php_printf("PHP with Suhosin-Patch %s (%s) (built: %s %s)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5650 php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2014 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
5652 php_output_teardown();
5655 --- php-5.5.0alpha1/win32/build/config.w32~ 2012-11-17 13:39:12.000000000 +0200
5656 +++ php-5.5.0alpha1/win32/build/config.w32 2012-11-17 13:48:11.720739542 +0200
5658 zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
5659 zend_object_handlers.c zend_objects_API.c \
5660 zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \
5661 - zend_float.c zend_string.c zend_generators.c");
5662 + zend_float.c zend_string.c zend_generators.c zend_canary.c zend_alloc_canary.c");
5664 if (VCVERS == 1200) {
5665 AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
5666 @@ -385,6 +385,7 @@ ADD_FLAG("CFLAGS", "/D FD_SETSIZE=" + pa
5668 AC_DEFINE('HAVE_USLEEP', 1);
5669 AC_DEFINE('HAVE_STRCOLL', 1);
5670 +AC_DEFINE('SUHOSIN_PATCH', 1);
5672 /* For snapshot builders, where can we find the additional
5673 * files that make up the snapshot template? */
5674 --- a/win32/build/config.w32.h.in
5675 +++ b/win32/build/config.w32.h.in
5677 /* Win32 supports strcoll */
5678 #define HAVE_STRCOLL 1
5680 +/* Suhosin Patch support */
5681 +#define SUHOSIN_PATCH 1
5683 /* Win32 supports socketpair by the emulation in win32/sockets.c */
5684 #define HAVE_SOCKETPAIR 1
5685 #define HAVE_SOCKLEN_T 1