Annotation of /trunk/php5/patches/php5-5.3.3-suhosin-0.9.10-2.patch
Parent Directory | Revision Log
Revision 1115 -
(hide annotations)
(download)
Sun Aug 22 18:37:54 2010 UTC (14 years, 1 month ago) by niro
File size: 197685 byte(s)
Sun Aug 22 18:37:54 2010 UTC (14 years, 1 month ago) by niro
File size: 197685 byte(s)
-added
1 | niro | 1115 | diff -Naur php-5.3.3/configure php-5.3.3-magellan/configure |
2 | --- php-5.3.3/configure 2010-07-21 12:53:06.000000000 +0200 | ||
3 | +++ php-5.3.3-magellan/configure 2010-07-26 12:11:25.000000000 +0200 | ||
4 | @@ -19162,6 +19162,9 @@ | ||
5 | |||
6 | fi | ||
7 | |||
8 | +cat >> confdefs.h <<\EOF | ||
9 | +#define SUHOSIN_PATCH 1 | ||
10 | +EOF | ||
11 | |||
12 | echo $ac_n "checking for declared timezone""... $ac_c" 1>&6 | ||
13 | echo "configure:19168: checking for declared timezone" >&5 | ||
14 | @@ -115978,7 +115981,7 @@ | ||
15 | php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ | ||
16 | strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ | ||
17 | network.c php_open_temporary_file.c php_logos.c \ | ||
18 | - output.c getopt.c; do | ||
19 | + output.c getopt.c suhosin_patch.c ; do | ||
20 | |||
21 | IFS=. | ||
22 | set $ac_src | ||
23 | @@ -116182,7 +116185,7 @@ | ||
24 | zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ | ||
25 | zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ | ||
26 | zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ | ||
27 | - zend_closures.c zend_float.c; do | ||
28 | + zend_closures.c zend_float.c zend_canary.c zend_alloc_canary.c ; do | ||
29 | |||
30 | IFS=. | ||
31 | set $ac_src | ||
32 | diff -Naur php-5.3.3/configure.in php-5.3.3-magellan/configure.in | ||
33 | --- php-5.3.3/configure.in 2010-07-21 12:50:07.000000000 +0200 | ||
34 | +++ php-5.3.3-magellan/configure.in 2010-07-26 12:11:25.000000000 +0200 | ||
35 | @@ -289,6 +289,7 @@ | ||
36 | sinclude(TSRM/threads.m4) | ||
37 | sinclude(TSRM/tsrm.m4) | ||
38 | |||
39 | +sinclude(main/suhosin_patch.m4) | ||
40 | |||
41 | divert(2) | ||
42 | |||
43 | @@ -1396,7 +1397,7 @@ | ||
44 | php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ | ||
45 | strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ | ||
46 | network.c php_open_temporary_file.c php_logos.c \ | ||
47 | - output.c getopt.c) | ||
48 | + output.c getopt.c suhosin_patch.c ) | ||
49 | |||
50 | PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \ | ||
51 | plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \ | ||
52 | @@ -1424,7 +1425,7 @@ | ||
53 | zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ | ||
54 | zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ | ||
55 | zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ | ||
56 | - zend_closures.c zend_float.c) | ||
57 | + zend_closures.c zend_float.c zend_canary.c zend_alloc_canary.c ) | ||
58 | |||
59 | if test -r "$abs_srcdir/Zend/zend_objects.c"; then | ||
60 | PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c) | ||
61 | diff -Naur php-5.3.3/ext/phar/stream.c php-5.3.3-magellan/ext/phar/stream.c | ||
62 | --- php-5.3.3/ext/phar/stream.c 2010-04-27 19:13:24.000000000 +0200 | ||
63 | +++ php-5.3.3-magellan/ext/phar/stream.c 2010-07-26 12:11:25.000000000 +0200 | ||
64 | @@ -470,7 +470,8 @@ | ||
65 | if (stream->mode[0] == 'w' || (stream->mode[0] == 'r' && stream->mode[1] == '+')) { | ||
66 | ret = phar_flush(((phar_entry_data *)stream->abstract)->phar, 0, 0, 0, &error TSRMLS_CC); | ||
67 | if (error) { | ||
68 | - php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS TSRMLS_CC, error); | ||
69 | + /* Fix format string vulnerability here, too because PHP.net did not */ | ||
70 | + php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS TSRMLS_CC, "%s", error); | ||
71 | efree(error); | ||
72 | } | ||
73 | return ret; | ||
74 | diff -Naur php-5.3.3/ext/standard/dl.c php-5.3.3-magellan/ext/standard/dl.c | ||
75 | --- php-5.3.3/ext/standard/dl.c 2010-01-03 10:23:27.000000000 +0100 | ||
76 | +++ php-5.3.3-magellan/ext/standard/dl.c 2010-07-26 12:11:25.000000000 +0200 | ||
77 | @@ -254,6 +254,23 @@ | ||
78 | return FAILURE; | ||
79 | } | ||
80 | } | ||
81 | + | ||
82 | +#if SUHOSIN_PATCH | ||
83 | + if (strncmp("suhosin", module_entry->name, sizeof("suhosin")-1) == 0) { | ||
84 | + void *log_func; | ||
85 | + /* sucessfully loaded suhosin extension, now check for logging function replacement */ | ||
86 | + log_func = (void *) DL_FETCH_SYMBOL(handle, "suhosin_log"); | ||
87 | + if (log_func == NULL) { | ||
88 | + log_func = (void *) DL_FETCH_SYMBOL(handle, "_suhosin_log"); | ||
89 | + } | ||
90 | + if (log_func != NULL) { | ||
91 | + zend_suhosin_log = log_func; | ||
92 | + } else { | ||
93 | + zend_suhosin_log(S_MISC, "could not replace logging function"); | ||
94 | + } | ||
95 | + } | ||
96 | +#endif | ||
97 | + | ||
98 | return SUCCESS; | ||
99 | } | ||
100 | /* }}} */ | ||
101 | diff -Naur php-5.3.3/ext/standard/info.c php-5.3.3-magellan/ext/standard/info.c | ||
102 | --- php-5.3.3/ext/standard/info.c 2010-05-30 09:46:45.000000000 +0200 | ||
103 | +++ php-5.3.3-magellan/ext/standard/info.c 2010-07-26 12:11:25.000000000 +0200 | ||
104 | @@ -878,6 +878,33 @@ | ||
105 | |||
106 | php_info_print_table_end(); | ||
107 | |||
108 | + /* Suhosin Patch */ | ||
109 | + php_info_print_box_start(0); | ||
110 | + if (expose_php && !sapi_module.phpinfo_as_text) { | ||
111 | + PUTS("<a href=\"http://www.suhosin.org\"><img border=\"0\" src=\""); | ||
112 | + if (SG(request_info).request_uri) { | ||
113 | + char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC); | ||
114 | + PUTS(elem_esc); | ||
115 | + efree(elem_esc); | ||
116 | + } | ||
117 | + PUTS("?="SUHOSIN_LOGO_GUID"\" alt=\"Suhosin logo\" /></a>\n"); | ||
118 | + } | ||
119 | + PUTS("This server is protected with the Suhosin Patch "); | ||
120 | + if (sapi_module.phpinfo_as_text) { | ||
121 | + PUTS(SUHOSIN_PATCH_VERSION); | ||
122 | + } else { | ||
123 | + zend_html_puts(SUHOSIN_PATCH_VERSION, strlen(SUHOSIN_PATCH_VERSION) TSRMLS_CC); | ||
124 | + } | ||
125 | + PUTS(!sapi_module.phpinfo_as_text?"<br />":"\n"); | ||
126 | + if (sapi_module.phpinfo_as_text) { | ||
127 | + PUTS("Copyright (c) 2006-2007 Hardened-PHP Project\n"); | ||
128 | + PUTS("Copyright (c) 2007-2009 SektionEins GmbH\n"); | ||
129 | + } else { | ||
130 | + PUTS("Copyright (c) 2006-2007 <a href=\"http://www.hardened-php.net/\">Hardened-PHP Project</a>\n"); | ||
131 | + PUTS("Copyright (c) 2007-2009 <a href=\"http://www.sektioneins.de/\">SektionEins GmbH</a>\n"); | ||
132 | + } | ||
133 | + php_info_print_box_end(); | ||
134 | + | ||
135 | /* Zend Engine */ | ||
136 | php_info_print_box_start(0); | ||
137 | if (expose_php && !sapi_module.phpinfo_as_text) { | ||
138 | diff -Naur php-5.3.3/ext/standard/syslog.c php-5.3.3-magellan/ext/standard/syslog.c | ||
139 | --- php-5.3.3/ext/standard/syslog.c 2010-01-03 10:23:27.000000000 +0100 | ||
140 | +++ php-5.3.3-magellan/ext/standard/syslog.c 2010-07-26 12:11:25.000000000 +0200 | ||
141 | @@ -42,6 +42,7 @@ | ||
142 | */ | ||
143 | PHP_MINIT_FUNCTION(syslog) | ||
144 | { | ||
145 | +#if !SUHOSIN_PATCH | ||
146 | /* error levels */ | ||
147 | REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */ | ||
148 | REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */ | ||
149 | @@ -97,6 +98,7 @@ | ||
150 | /* AIX doesn't have LOG_PERROR */ | ||
151 | REGISTER_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/ | ||
152 | #endif | ||
153 | +#endif | ||
154 | BG(syslog_device)=NULL; | ||
155 | |||
156 | return SUCCESS; | ||
157 | diff -Naur php-5.3.3/main/fopen_wrappers.c php-5.3.3-magellan/main/fopen_wrappers.c | ||
158 | --- php-5.3.3/main/fopen_wrappers.c 2010-04-22 00:22:31.000000000 +0200 | ||
159 | +++ php-5.3.3-magellan/main/fopen_wrappers.c 2010-07-26 12:11:25.000000000 +0200 | ||
160 | @@ -85,13 +85,8 @@ | ||
161 | PHPAPI ZEND_INI_MH(OnUpdateBaseDir) | ||
162 | { | ||
163 | char **p, *pathbuf, *ptr, *end; | ||
164 | -#ifndef ZTS | ||
165 | - char *base = (char *) mh_arg2; | ||
166 | -#else | ||
167 | - char *base = (char *) ts_resource(*((int *) mh_arg2)); | ||
168 | -#endif | ||
169 | |||
170 | - p = (char **) (base + (size_t) mh_arg1); | ||
171 | + p = &PG(open_basedir); | ||
172 | |||
173 | if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) { | ||
174 | /* We're in a PHP_INI_SYSTEM context, no restrictions */ | ||
175 | diff -Naur php-5.3.3/main/main.c php-5.3.3-magellan/main/main.c | ||
176 | --- php-5.3.3/main/main.c 2010-03-12 11:28:59.000000000 +0100 | ||
177 | +++ php-5.3.3-magellan/main/main.c 2010-07-26 12:11:25.000000000 +0200 | ||
178 | @@ -90,6 +90,9 @@ | ||
179 | |||
180 | #include "SAPI.h" | ||
181 | #include "rfc1867.h" | ||
182 | +#if SUHOSIN_PATCH | ||
183 | +#include "suhosin_globals.h" | ||
184 | +#endif | ||
185 | |||
186 | #if HAVE_SYS_MMAN_H | ||
187 | # include <sys/mman.h> | ||
188 | @@ -488,7 +491,7 @@ | ||
189 | STD_PHP_INI_ENTRY("extension_dir", PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir, php_core_globals, core_globals) | ||
190 | STD_PHP_INI_ENTRY("include_path", PHP_INCLUDE_PATH, PHP_INI_ALL, OnUpdateStringUnempty, include_path, php_core_globals, core_globals) | ||
191 | PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnUpdateTimeout) | ||
192 | - STD_PHP_INI_ENTRY("open_basedir", NULL, PHP_INI_ALL, OnUpdateBaseDir, open_basedir, php_core_globals, core_globals) | ||
193 | + PHP_INI_ENTRY("open_basedir", NULL, PHP_INI_ALL, OnUpdateBaseDir) | ||
194 | STD_PHP_INI_ENTRY("safe_mode_exec_dir", PHP_SAFE_MODE_EXEC_DIR, PHP_INI_SYSTEM, OnUpdateString, safe_mode_exec_dir, php_core_globals, core_globals) | ||
195 | |||
196 | STD_PHP_INI_BOOLEAN("file_uploads", "1", PHP_INI_SYSTEM, OnUpdateBool, file_uploads, php_core_globals, core_globals) | ||
197 | @@ -1778,6 +1781,10 @@ | ||
198 | } | ||
199 | #endif | ||
200 | |||
201 | +#if SUHOSIN_PATCH | ||
202 | +PHPAPI void suhosin_startup(); | ||
203 | +#endif | ||
204 | + | ||
205 | /* {{{ php_module_startup | ||
206 | */ | ||
207 | int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules, uint num_additional_modules) | ||
208 | @@ -1822,6 +1829,10 @@ | ||
209 | tsrm_ls = ts_resource(0); | ||
210 | #endif | ||
211 | |||
212 | +#if SUHOSIN_PATCH | ||
213 | + suhosin_startup(); | ||
214 | +#endif | ||
215 | + | ||
216 | module_shutdown = 0; | ||
217 | module_startup = 1; | ||
218 | sapi_initialize_empty_request(TSRMLS_C); | ||
219 | @@ -1941,7 +1952,11 @@ | ||
220 | 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); | ||
221 | REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS); | ||
222 | REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, CONST_PERSISTENT | CONST_CS); | ||
223 | - REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS); | ||
224 | +#if SUHOSIN_PATCH | ||
225 | + REGISTER_MAIN_LONG_CONSTANT("SUHOSIN_PATCH", 1, CONST_PERSISTENT | CONST_CS); | ||
226 | + REGISTER_MAIN_STRINGL_CONSTANT("SUHOSIN_PATCH_VERSION", SUHOSIN_PATCH_VERSION, sizeof(SUHOSIN_PATCH_VERSION)-1, CONST_PERSISTENT | CONST_CS); | ||
227 | +#endif | ||
228 | + REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS); | ||
229 | REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", LONG_MAX, CONST_PERSISTENT | CONST_CS); | ||
230 | REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", sizeof(long), CONST_PERSISTENT | CONST_CS); | ||
231 | |||
232 | diff -Naur php-5.3.3/main/php_config.h.in php-5.3.3-magellan/main/php_config.h.in | ||
233 | --- php-5.3.3/main/php_config.h.in 2010-07-21 12:53:11.000000000 +0200 | ||
234 | +++ php-5.3.3-magellan/main/php_config.h.in 2010-07-26 12:11:25.000000000 +0200 | ||
235 | @@ -848,6 +848,9 @@ | ||
236 | /* Define if the target system has /dev/urandom device */ | ||
237 | #undef HAVE_DEV_URANDOM | ||
238 | |||
239 | +/* Suhosin-Patch for PHP */ | ||
240 | +#undef SUHOSIN_PATCH | ||
241 | + | ||
242 | /* Whether you have AOLserver */ | ||
243 | #undef HAVE_AOLSERVER | ||
244 | |||
245 | diff -Naur php-5.3.3/main/php.h php-5.3.3-magellan/main/php.h | ||
246 | --- php-5.3.3/main/php.h 2010-03-12 11:28:59.000000000 +0100 | ||
247 | +++ php-5.3.3-magellan/main/php.h 2010-07-26 12:11:25.000000000 +0200 | ||
248 | @@ -453,6 +453,10 @@ | ||
249 | #endif | ||
250 | #endif /* !XtOffsetOf */ | ||
251 | |||
252 | +#if SUHOSIN_PATCH | ||
253 | +#include "suhosin_patch.h" | ||
254 | +#endif | ||
255 | + | ||
256 | #endif | ||
257 | |||
258 | /* | ||
259 | diff -Naur php-5.3.3/main/php_logos.c php-5.3.3-magellan/main/php_logos.c | ||
260 | --- php-5.3.3/main/php_logos.c 2010-03-12 11:28:59.000000000 +0100 | ||
261 | +++ php-5.3.3-magellan/main/php_logos.c 2010-07-26 12:11:25.000000000 +0200 | ||
262 | @@ -50,6 +50,10 @@ | ||
263 | return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string)); | ||
264 | } | ||
265 | |||
266 | +#if SUHOSIN_PATCH | ||
267 | +#include "suhosin_logo.h" | ||
268 | +#endif | ||
269 | + | ||
270 | int php_init_info_logos(void) | ||
271 | { | ||
272 | if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE) | ||
273 | @@ -58,7 +62,9 @@ | ||
274 | php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo)); | ||
275 | php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo)); | ||
276 | php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo)); | ||
277 | - | ||
278 | +#if SUHOSIN_PATCH | ||
279 | + php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo , sizeof(suhosin_logo)); | ||
280 | +#endif | ||
281 | return SUCCESS; | ||
282 | } | ||
283 | |||
284 | diff -Naur php-5.3.3/main/snprintf.c php-5.3.3-magellan/main/snprintf.c | ||
285 | --- php-5.3.3/main/snprintf.c 2010-01-03 10:23:27.000000000 +0100 | ||
286 | +++ php-5.3.3-magellan/main/snprintf.c 2010-07-26 12:11:25.000000000 +0200 | ||
287 | @@ -780,6 +780,10 @@ | ||
288 | */ | ||
289 | switch (*fmt) { | ||
290 | case 'Z': | ||
291 | +#if SUHOSIN_PATCH | ||
292 | + zend_suhosin_log(S_MISC, "'Z' specifier within format string"); | ||
293 | + goto skip_output; | ||
294 | +#else | ||
295 | zvp = (zval*) va_arg(ap, zval*); | ||
296 | zend_make_printable_zval(zvp, &zcopy, &free_zcopy); | ||
297 | if (free_zcopy) { | ||
298 | @@ -790,6 +794,7 @@ | ||
299 | if (adjust_precision && precision < s_len) { | ||
300 | s_len = precision; | ||
301 | } | ||
302 | +#endif | ||
303 | break; | ||
304 | case 'u': | ||
305 | switch(modifier) { | ||
306 | @@ -1091,7 +1096,11 @@ | ||
307 | |||
308 | |||
309 | case 'n': | ||
310 | +#if SUHOSIN_PATCH | ||
311 | + zend_suhosin_log(S_MISC, "'n' specifier within format string"); | ||
312 | +#else | ||
313 | *(va_arg(ap, int *)) = cc; | ||
314 | +#endif | ||
315 | goto skip_output; | ||
316 | |||
317 | /* | ||
318 | diff -Naur php-5.3.3/main/spprintf.c php-5.3.3-magellan/main/spprintf.c | ||
319 | --- php-5.3.3/main/spprintf.c 2010-01-03 10:23:27.000000000 +0100 | ||
320 | +++ php-5.3.3-magellan/main/spprintf.c 2010-07-26 12:11:25.000000000 +0200 | ||
321 | @@ -388,6 +388,10 @@ | ||
322 | */ | ||
323 | switch (*fmt) { | ||
324 | case 'Z': | ||
325 | +#if SUHOSIN_PATCH | ||
326 | + zend_suhosin_log(S_MISC, "'Z' specifier within format string"); | ||
327 | + goto skip_output; | ||
328 | +#else | ||
329 | zvp = (zval*) va_arg(ap, zval*); | ||
330 | zend_make_printable_zval(zvp, &zcopy, &free_zcopy); | ||
331 | if (free_zcopy) { | ||
332 | @@ -398,6 +402,7 @@ | ||
333 | if (adjust_precision && precision < s_len) { | ||
334 | s_len = precision; | ||
335 | } | ||
336 | +#endif | ||
337 | break; | ||
338 | case 'u': | ||
339 | switch(modifier) { | ||
340 | @@ -698,7 +703,11 @@ | ||
341 | |||
342 | |||
343 | case 'n': | ||
344 | +#if SUHOSIN_PATCH | ||
345 | + zend_suhosin_log(S_MISC, "'n' specifier within format string"); | ||
346 | +#else | ||
347 | *(va_arg(ap, int *)) = xbuf->len; | ||
348 | +#endif | ||
349 | goto skip_output; | ||
350 | |||
351 | /* | ||
352 | diff -Naur php-5.3.3/main/suhosin_globals.h php-5.3.3-magellan/main/suhosin_globals.h | ||
353 | --- php-5.3.3/main/suhosin_globals.h 1970-01-01 01:00:00.000000000 +0100 | ||
354 | +++ php-5.3.3-magellan/main/suhosin_globals.h 2010-07-26 12:11:25.000000000 +0200 | ||
355 | @@ -0,0 +1,61 @@ | ||
356 | +/* | ||
357 | + +----------------------------------------------------------------------+ | ||
358 | + | Suhosin-Patch for PHP | | ||
359 | + +----------------------------------------------------------------------+ | ||
360 | + | Copyright (c) 2004-2009 Stefan Esser | | ||
361 | + +----------------------------------------------------------------------+ | ||
362 | + | This source file is subject to version 2.02 of the PHP license, | | ||
363 | + | that is bundled with this package in the file LICENSE, and is | | ||
364 | + | available at through the world-wide-web at | | ||
365 | + | http://www.php.net/license/2_02.txt. | | ||
366 | + | If you did not receive a copy of the PHP license and are unable to | | ||
367 | + | obtain it through the world-wide-web, please send a note to | | ||
368 | + | license@php.net so we can mail you a copy immediately. | | ||
369 | + +----------------------------------------------------------------------+ | ||
370 | + | Author: Stefan Esser <stefan.esser@sektioneins.de> | | ||
371 | + +----------------------------------------------------------------------+ | ||
372 | + */ | ||
373 | + | ||
374 | +#ifndef SUHOSIN_GLOBALS_H | ||
375 | +#define SUHOSIN_GLOBALS_H | ||
376 | + | ||
377 | +typedef struct _suhosin_patch_globals suhosin_patch_globals_struct; | ||
378 | + | ||
379 | +#ifdef ZTS | ||
380 | +# define SPG(v) TSRMG(suhosin_patch_globals_id, suhosin_patch_globals_struct *, v) | ||
381 | +extern int suhosin_patch_globals_id; | ||
382 | +#else | ||
383 | +# define SPG(v) (suhosin_patch_globals.v) | ||
384 | +extern struct _suhosin_patch_globals suhosin_patch_globals; | ||
385 | +#endif | ||
386 | + | ||
387 | + | ||
388 | +struct _suhosin_patch_globals { | ||
389 | + /* logging */ | ||
390 | + int log_syslog; | ||
391 | + int log_syslog_facility; | ||
392 | + int log_syslog_priority; | ||
393 | + int log_sapi; | ||
394 | + int log_script; | ||
395 | + int log_phpscript; | ||
396 | + char *log_scriptname; | ||
397 | + char *log_phpscriptname; | ||
398 | + zend_bool log_phpscript_is_safe; | ||
399 | + zend_bool log_use_x_forwarded_for; | ||
400 | + | ||
401 | + /* memory manager canary protection */ | ||
402 | + unsigned int canary_1; | ||
403 | + unsigned int canary_2; | ||
404 | + unsigned int canary_3; | ||
405 | + unsigned int dummy; | ||
406 | +}; | ||
407 | + | ||
408 | + | ||
409 | +#endif /* SUHOSIN_GLOBALS_H */ | ||
410 | + | ||
411 | +/* | ||
412 | + * Local variables: | ||
413 | + * tab-width: 4 | ||
414 | + * c-basic-offset: 4 | ||
415 | + * End: | ||
416 | + */ | ||
417 | diff -Naur php-5.3.3/main/suhosin_logo.h php-5.3.3-magellan/main/suhosin_logo.h | ||
418 | --- php-5.3.3/main/suhosin_logo.h 1970-01-01 01:00:00.000000000 +0100 | ||
419 | +++ php-5.3.3-magellan/main/suhosin_logo.h 2010-07-26 12:11:25.000000000 +0200 | ||
420 | @@ -0,0 +1,178 @@ | ||
421 | +static unsigned char suhosin_logo[] = | ||
422 | + "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48" | ||
423 | + "\x00\x48\x00\x00\xff\xe1\x00\x16\x45\x78\x69\x66\x00\x00\x4d\x4d" | ||
424 | + "\x00\x2a\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\xff\xdb\x00\x43" | ||
425 | + "\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" | ||
426 | + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" | ||
427 | + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" | ||
428 | + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01" | ||
429 | + "\x01\xff\xc0\x00\x0b\x08\x00\x27\x00\x71\x01\x01\x22\x00\xff\xc4" | ||
430 | + "\x00\x1e\x00\x00\x02\x02\x02\x03\x01\x01\x00\x00\x00\x00\x00\x00" | ||
431 | + "\x00\x00\x00\x00\x09\x06\x08\x05\x07\x02\x03\x0a\x01\x04\xff\xc4" | ||
432 | + "\x00\x32\x10\x00\x01\x04\x03\x00\x02\x00\x05\x01\x05\x09\x01\x00" | ||
433 | + "\x00\x00\x00\x05\x02\x03\x04\x06\x01\x07\x08\x00\x09\x11\x12\x13" | ||
434 | + "\x14\x21\x15\x0a\x16\x31\x56\x96\x17\x18\x19\x23\x32\x41\x58\x98" | ||
435 | + "\xd4\xd6\xff\xda\x00\x08\x01\x01\x00\x00\x3f\x00\xf4\xc1\xe1\xe5" | ||
436 | + "\x69\xe9\x3e\xb9\xd1\x7c\x8a\x2e\x9d\x66\xe8\x3b\x29\x4d\x7f\x46" | ||
437 | + "\xba\x58\x55\x54\x8d\xb1\x5f\xaa\xd9\x8d\x51\x2b\xb6\x27\x5a\x69" | ||
438 | + "\xd1\x43\xaf\x16\x1a\xf0\xb2\xb1\xe9\x6d\x9f\xc2\xa4\x36\x18\xb5" | ||
439 | + "\x85\x10\x41\xbe\xfc\x09\xac\x49\x29\x11\xd4\x32\x97\xec\x08\x13" | ||
440 | + "\xc1\x2d\x20\xc3\x59\xeb\x26\x05\xd8\x6b\x76\x31\x43\x8f\x57\xcf" | ||
441 | + "\x84\x9f\x14\xa8\x53\x81\x0b\xc3\x64\x80\xa3\x02\x0a\x41\x75\xf8" | ||
442 | + "\x44\x85\x93\x81\x22\x3c\xd8\x13\xe1\xbe\xf4\x59\x91\x1f\x6a\x44" | ||
443 | + "\x77\x5c\x69\xc4\x2f\x39\x5f\x0f\x2a\x8d\xeb\xba\xf8\xc3\x56\x6c" | ||
444 | + "\x3b\x36\xa7\xda\xbd\x4d\xa1\xb5\x4e\xc6\xa7\xa4\x3a\xec\x15\x2d" | ||
445 | + "\xa5\xb3\xea\x5a\xdc\xac\x46\xac\x01\x60\xd8\x43\xc8\x8e\x8b\xb1" | ||
446 | + "\x40\x4c\x95\x8b\x34\x41\x28\x52\x91\x28\x43\xd3\xa3\xb6\xa7\x55" | ||
447 | + "\x15\xe7\x5a\x96\xcb\xf1\xda\xe5\x55\xee\xfe\x1e\xbd\xd9\x41\xd3" | ||
448 | + "\x28\xfd\x97\xca\x57\x2b\x85\x9c\xa4\x30\x95\xaa\xa5\x57\xa2\x35" | ||
449 | + "\x15\x86\xcb\x61\x34\x41\xe4\xc7\x80\x20\x18\x21\x17\x09\x85\x0b" | ||
450 | + "\x14\x9d\x21\x68\x62\x1c\x08\x11\x64\x4b\x92\xf2\xd2\xd3\x2d\x2d" | ||
451 | + "\x6a\xc2\x73\x6b\x3c\x3c\x8b\x9e\xbc\x52\xaa\xa4\xab\x81\x6c\xf6" | ||
452 | + "\xfa\xbd\x70\xc5\xc6\x7b\xc2\xaa\x22\x4f\x58\x04\x87\x25\x6a\x27" | ||
453 | + "\x1d\xa4\x3d\x20\x75\x72\x01\x09\x71\xe5\x1c\x9e\xc3\x2e\x36\xf3" | ||
454 | + "\xd0\xc6\x35\x2a\x43\x4d\x2d\x0e\x2d\xb4\xa1\x49\xce\x65\x1e\x52" | ||
455 | + "\x9e\xa1\xf6\x09\xcc\xdc\x63\x66\xa8\x01\xe9\x3b\x0d\xd7\x5a\x85" | ||
456 | + "\xbb\xc5\x65\xc0\x7b\x2e\x46\xa9\xd9\x56\x1d\x4c\x92\x72\x26\x4e" | ||
457 | + "\x86\xd5\x68\xae\xc4\xaa\x55\xce\xd7\x83\x59\xb3\x81\xee\xce\x74" | ||
458 | + "\x39\x39\x31\x9f\x8a\x25\xe8\xa5\xa5\xe5\x81\xf2\x11\x23\xcb\xa1" | ||
459 | + "\x1e\x43\x12\xe3\xb1\x2a\x2b\xcd\xc8\x8d\x25\x96\xa4\x47\x7d\x95" | ||
460 | + "\xa5\xc6\x9f\x61\xe4\x25\xc6\x5e\x69\xc4\xe7\x29\x5b\x6e\xb6\xa4" | ||
461 | + "\xad\x0b\x4e\x72\x95\x25\x58\x56\x33\x9c\x67\xce\xef\x0f\x17\xbf" | ||
462 | + "\x4c\x7b\x2d\xe6\xfe\x76\x35\x27\x5a\x07\x97\x67\xe8\xae\x8d\x71" | ||
463 | + "\x0f\xb2\x13\x99\xb9\xbc\x14\xad\xb3\xb7\xe6\x11\x6f\xe0\xda\x58" | ||
464 | + "\xb1\x08\xac\xa6\x6c\x2d\x7f\x05\xb7\x56\xd2\xe6\xcf\xbb\x4d\x0c" | ||
465 | + "\xe3\x50\xb2\xec\x91\xf0\x4a\xb8\xd6\x22\xb8\xa7\xf6\x67\xaf\xcf" | ||
466 | + "\x63\x7e\xd7\xe7\x42\xd8\xbd\xc3\x71\xa1\xf2\x7e\x9b\xa8\x97\x83" | ||
467 | + "\x6e\xd1\xdc\x4b\x06\x11\x2d\xae\x26\x61\x98\x72\x10\xf4\x42\x5d" | ||
468 | + "\x20\x4a\xa3\x73\xd7\xf2\xcd\x3c\x48\x32\xe4\x03\x9f\x80\x37\x08" | ||
469 | + "\x36\x11\xd0\xcb\x97\x6c\x08\xed\x6d\x33\x24\xa2\x1b\xb4\x77\xdf" | ||
470 | + "\x61\x5d\x5f\xc1\x43\xc2\x82\xeb\x0f\x5d\x84\x08\x68\xaa\xa4\x01" | ||
471 | + "\xe1\x19\xdf\xbc\x31\x65\xfe\xd1\xf5\x7d\x7a\xb2\x2a\x33\x50\x21" | ||
472 | + "\x2a\x56\x9d\xb1\x81\xab\xdb\x35\x78\x30\x83\xd9\x89\x1d\x31\xac" | ||
473 | + "\x96\x14\x07\x61\xbc\x20\x68\x42\x85\x33\x19\xac\xbe\xdb\x34\x56" | ||
474 | + "\xf1\xd5\xfd\x29\xa9\x28\xdb\xcb\x4c\x5a\x23\xdc\xf5\x96\xc5\x10" | ||
475 | + "\xa3\x35\x5b\x14\x68\xd3\x61\x62\x64\x76\x26\xcb\x17\x3e\x34\x98" | ||
476 | + "\x04\xa3\xc4\x20\x38\x90\x92\xe3\xc8\x07\x2c\x36\x74\x66\x26\x0e" | ||
477 | + "\x29\x02\x64\x29\x2d\x21\xe6\x16\x9c\x6b\xce\xa3\x89\xd9\x4f\xd3" | ||
478 | + "\xc4\xbd\xc5\x87\x79\x9c\x65\xf6\x39\x45\x60\xe8\xce\x9e\xab\x6d" | ||
479 | + "\x13\x15\x22\xe1\x5e\x4b\x38\x42\xc4\x1e\xd5\x76\xe0\xc5\xeb\x85" | ||
480 | + "\x07\x2d\x0f\xb8\xb6\xa6\xd6\x6d\x71\x0d\xa2\x43\x4c\x25\xea\xfa" | ||
481 | + "\xa1\xae\x4c\xe4\x7d\xbd\x76\xa9\xfb\x06\xc2\x83\x42\xeb\xad\xe7" | ||
482 | + "\xe9\x5f\x68\x6f\xba\xfb\x2f\x07\xce\xb8\x13\xc1\x9b\xeb\xb0\x76" | ||
483 | + "\x45\x57\x28\x7b\xea\xbe\x0f\xf4\x30\x7b\xa0\xed\xe4\x22\x93\x21" | ||
484 | + "\xfc\xbc\xe0\xb9\x75\xc1\x4f\xfc\xef\xb6\xfa\xa1\xfc\x64\xa1\x4a" | ||
485 | + "\x82\xc7\x33\xad\x75\xed\x82\xbd\x3d\xdb\xf7\xa8\xbe\x5e\xbb\x36" | ||
486 | + "\x62\x04\x9a\x2e\xc5\xd9\x9e\x9c\x3a\x0b\x98\x0b\x57\xac\xf1\x24" | ||
487 | + "\x62\x58\x83\x15\x5b\xa6\xf2\xda\x34\x70\x03\xce\x0f\x93\x1b\x12" | ||
488 | + "\xc7\xce\x54\x87\x33\x15\xd6\x53\x25\x1f\x2a\x90\x87\x12\xe3\x78" | ||
489 | + "\xef\x55\x77\x4d\x4a\xd8\x7e\xef\xd2\xfd\xd1\xaf\x3a\xaf\x55\xdb" | ||
490 | + "\x6a\x2d\x3d\x42\xac\x51\x79\xee\x91\xab\xe1\x05\x2d\x3c\x80\xa2" | ||
491 | + "\x43\xad\x22\x2e\xd5\x33\x13\xa4\x9e\x00\xe0\x04\x10\x84\xc8\xf2" | ||
492 | + "\x19\x30\x92\x1f\xaa\xc3\x28\xc9\x76\x30\x3f\xe9\x10\x61\x5e\x79" | ||
493 | + "\xd5\xf7\xdf\xd0\x54\xdb\xae\xb6\xae\xfa\xe8\xa3\x57\xe0\x6c\x2d" | ||
494 | + "\xf7\xbd\x49\xd6\x6e\x76\x79\xcc\x54\x0c\x5f\xff\x00\xbb\x06\x98" | ||
495 | + "\xa6\x9e\x89\x61\xb4\x6f\xc3\xe3\x6a\xc2\x4f\x59\x03\xc9\x80\x2c" | ||
496 | + "\x59\x24\x44\x70\x38\xd5\x96\x6a\x9e\x8b\x81\x64\xe5\xbc\xa0\x3c" | ||
497 | + "\x33\xaf\x17\x9d\xff\x00\x71\x1a\xd1\x3a\x80\x66\xb3\xd9\x31\x77" | ||
498 | + "\x0d\x12\xbd\xae\x29\xb5\x6a\xd6\xcf\x8d\x68\x87\x75\xcd\xe8\x65" | ||
499 | + "\x5a\xbe\x3c\x04\x7b\x34\xdb\x54\x19\xa4\x63\x9c\x2a\x5d\x23\xbe" | ||
500 | + "\xf4\xb1\x1c\x4d\x90\xec\x92\x2f\x49\x71\xf7\x14\xf2\x97\x9f\x15" | ||
501 | + "\x57\xed\x13\x21\x2a\xf5\x33\xd1\x2a\x52\x52\xac\xb7\x62\xd1\xcb" | ||
502 | + "\x46\x73\x8c\x67\x28\x56\x77\x86\xbf\x6f\x2a\x4e\x73\xfe\x95\x65" | ||
503 | + "\x0b\x5a\x3e\x38\xfc\xfc\xaa\x56\x3f\x86\x73\xe3\xb9\x4a\x52\x84" | ||
504 | + "\xa5\x08\x4e\x12\x94\x27\x09\x4a\x53\x8c\x61\x29\x4a\x71\xf0\x4a" | ||
505 | + "\x53\x8c\x7e\x31\x8c\x63\x18\xc6\x31\x8f\xc6\x31\xf8\xc7\x9f\x7c" | ||
506 | + "\xd5\xbb\xae\x5e\xe2\x1f\xab\x6e\x24\x34\x00\x8a\x25\x83\x70\x40" | ||
507 | + "\x1c\xcc\xda\x45\x7f\x66\x4e\x30\x2e\x94\x7e\x74\x49\xf0\xe4\x4e" | ||
508 | + "\x06\x5c\xa8\x2f\x89\x21\x2e\x98\x0e\xd9\x21\xc2\x0b\x21\x0f\xc4" | ||
509 | + "\x16\x6e\x48\xd9\xe4\xe3\x4a\x19\x1e\x64\x67\x54\xff\x00\x3a\x6d" | ||
510 | + "\x4f\x62\xb5\x00\x4a\xaa\x51\xfd\x2d\xe8\x0e\x6c\xaf\xc6\x7d\x6d" | ||
511 | + "\xc8\x88\xc7\x67\xea\x8a\x58\x02\x73\xe3\x65\x4d\xc9\x24\xc0\x3d" | ||
512 | + "\x57\xa3\x2e\x53\x16\x99\x4f\xe5\xe7\x19\x97\x3e\x3b\xcf\xc9\x4b" | ||
513 | + "\x99\x7f\x33\x25\xa5\xdf\xba\x77\x2b\xd3\x3e\xc2\x7b\x8b\x94\x07" | ||
514 | + "\xe9\x52\x5b\x43\x87\x34\x14\x86\x37\xcf\x41\x6b\x8e\x6a\xa5\x22" | ||
515 | + "\xab\xdb\x96\xa2\xcf\x46\xd8\x9b\x45\x93\xef\xd6\xdf\x3e\x99\x9c" | ||
516 | + "\x7e\x29\x10\x6b\x6c\xa2\xb8\x43\x05\x09\x44\x70\x8c\xb8\xaa\x54" | ||
517 | + "\x7c\x30\x36\x5e\x1c\x5e\x5b\x9f\x6c\x0d\x81\xee\xa0\x93\x8d\x67" | ||
518 | + "\x55\xf3\x87\xaf\xaa\x6b\x58\xf9\xbe\xb2\x36\x07\x42\x6e\xbd\x96" | ||
519 | + "\xe3\x9f\x1f\x8f\xc9\xf4\x9d\xae\x6a\x7d\x4c\x96\xbe\x5f\xc7\xcd" | ||
520 | + "\xf3\xb2\xf7\xcd\xf0\xcf\xc3\xe4\xf8\xfe\x37\x4f\x1c\x4d\xf6\x40" | ||
521 | + "\xf1\x6b\x7c\x4e\xe0\xa6\x71\xad\x56\xa7\x1c\x5c\x15\x6b\xfc\xf3" | ||
522 | + "\x01\x5d\xac\xf1\x75\x9a\x72\x6b\xaa\x28\xc5\x88\x6d\xfb\x33\x85" | ||
523 | + "\xe0\x4e\x61\xab\xeb\x31\x2c\x71\x08\x73\x11\x3b\xfc\xb5\xc0\x96" | ||
524 | + "\xcc\x87\x24\x44\xb5\x9b\x9e\xb3\x71\xba\xe9\xed\xb1\x4e\xd7\x76" | ||
525 | + "\x6c\xd2\xb6\x05\xb7\x5a\xde\xeb\x34\x5b\x96\x16\xfb\x59\xa9\x5c" | ||
526 | + "\x4f\x55\xca\x8a\xac\x59\xb0\xe4\x54\x39\x25\xbc\x81\x37\x2a\x09" | ||
527 | + "\x5f\x9e\x3b\x6b\x7d\x1f\x69\xf3\x34\x85\x39\x84\xa7\x28\x0b\xd3" | ||
528 | + "\xfd\xfb\x4b\x7a\xea\xe7\xd2\x3c\xd3\xda\x15\x68\xbc\x73\xd3\x22" | ||
529 | + "\x6f\xd7\x72\x5b\x2b\x66\xee\xa8\x0d\x54\xe8\x5b\xf9\x92\x96\x92" | ||
530 | + "\x93\xea\x97\x4a\xc7\x43\x10\x46\x35\xc5\xc0\x60\x8a\xe4\xc1\xb5" | ||
531 | + "\x36\xc6\xae\xed\xf7\x70\xa5\x86\x99\x3d\x91\xf8\xfd\x4e\x53\xeb" | ||
532 | + "\xbb\xbd\x6d\xec\x8f\xd7\x89\x3d\x31\x7f\xd7\x78\xba\x50\xbb\x74" | ||
533 | + "\x9d\xf6\xac\x4e\xb9\x03\x9c\x79\xd5\xe1\xbd\x17\x68\xd9\x13\x0b" | ||
534 | + "\x45\x75\x88\x00\x1d\x1f\xae\x73\x6a\x1d\x5c\x6e\x44\x9f\xa6\xfa" | ||
535 | + "\x4e\xd8\x25\x8b\xc0\xbc\xb2\x99\xe3\x17\x24\xb3\x23\xe2\x48\x8b" | ||
536 | + "\xfa\x22\xe7\x7e\x8f\xe6\x3f\x5f\x55\x0d\x75\xd3\x51\x0b\xd7\xed" | ||
537 | + "\xd3\x6f\x97\x3b\x85\x42\x80\x7e\x5f\xdc\x1b\xd6\xba\xee\xc4\x80" | ||
538 | + "\xce\x06\xa9\x15\x8c\x97\x5f\x40\x69\xb2\x4d\xc5\xb2\x5c\x1e\x01" | ||
539 | + "\x87\x7e\xe0\x36\x6d\x78\x80\x4e\x3c\x02\xec\x90\x1d\x11\x81\x74" | ||
540 | + "\xa5\x8b\xa4\xa0\x56\x06\xd5\x79\x72\x85\x57\x3b\xb2\x2e\xae\x90" | ||
541 | + "\x18\x8d\x91\xb2\x0e\x44\x19\xaa\xb4\xcc\x08\xed\x46\xfa\xd7\x2b" | ||
542 | + "\x78\x58\x72\x5d\xbb\x5e\x49\xe7\xee\xf3\x8a\x9d\x22\xa4\x19\xc8" | ||
543 | + "\xe7\x08\xc3\x90\x9b\x35\x9a\xa4\x25\x8c\x4b\x9b\xa7\xf8\xbf\x81" | ||
544 | + "\xf5\xdf\x22\x66\xf1\x7e\x9f\x66\x3d\xbb\xfa\x73\x73\x4d\xfd\x67" | ||
545 | + "\x7b\xf4\xce\xc3\x62\x2e\x6f\xbb\x0c\xa2\xdc\x69\xfc\x8a\x17\x0e" | ||
546 | + "\x3a\x9e\x83\x46\xd7\xe3\x5e\x65\x86\xc0\x51\x00\xbb\x91\xe3\xe1" | ||
547 | + "\xc1\x16\xc4\xe9\x65\x5c\x14\x3e\x44\x6a\x6b\xd1\x1e\xb0\x36\xdd" | ||
548 | + "\x0b\x7d\x8a\xeb\xaf\x58\x5b\x64\x3f\x38\xed\x52\x76\xe8\x46\xf7" | ||
549 | + "\x86\x84\xb3\x93\xb1\x0b\xe5\xfd\xfd\x0d\xe9\x6d\xe4\xf1\x1b\x1d" | ||
550 | + "\x56\xb4\x34\xe4\x6a\xf5\xa4\x9c\x2c\xc9\x64\x94\xc1\xf5\x79\x6d" | ||
551 | + "\x12\x96\xf3\x47\xc5\x48\xa8\xdb\xd8\x95\x64\x29\xcf\xf6\x88\xf1" | ||
552 | + "\x95\x7a\x98\xe8\xbc\x27\x19\xce\x73\x61\xd1\xb8\xc6\x31\x8c\xe7" | ||
553 | + "\x39\xce\x77\x9e\xbc\xc6\x31\x8c\x63\xf3\x9c\xe7\x39\xc6\x31\x8f" | ||
554 | + "\xf7\xce\x7e\x1e\x3b\x7f\x0f\x0f\x0f\x13\x57\xb9\x0a\xe1\x0b\x64" | ||
555 | + "\x5f\x58\x40\xc6\xc7\x7a\x4b\xf2\x3d\xbc\x71\xf4\xa7\xd2\xca\x14" | ||
556 | + "\xe2\x98\x1a\x30\x1e\xe0\x26\x5a\x6a\xf0\x9c\x67\x38\x66\x00\xb8" | ||
557 | + "\x72\xe6\xbe\xac\xfe\x12\xd3\x0b\x56\x73\x8c\x63\xc7\x2b\xe1\xe2" | ||
558 | + "\xe8\xdd\x7b\xff\x00\xd8\xe5\x23\x6c\xce\xa8\x69\xcf\x5e\x3a\xef" | ||
559 | + "\x77\xea\xe5\xab\x0e\x82\xdb\xd9\xed\x7a\x9e\xb8\x6d\x51\x32\xdb" | ||
560 | + "\x79\xc3\x36\x9a\x2d\xa3\x50\x39\x65\x0a\x63\x0e\xe5\xd4\x39\x12" | ||
561 | + "\xbf\x8b\x98\xa4\xa1\x2d\xad\xb3\xcf\x65\x6a\x43\x78\xb3\x3b\x07" | ||
562 | + "\xd8\xd5\xea\xae\x76\xad\x6f\xf5\xff\x00\xca\x93\xab\x96\xb0\x64" | ||
563 | + "\xeb\xd6\x4a\xd5\x87\xba\xec\x24\x60\x97\x06\x76\x03\xe3\x4c\x07" | ||
564 | + "\x29\x11\x8e\x34\x25\x02\x64\x29\xf0\x25\x48\x85\x3a\x33\x8b\x7a" | ||
565 | + "\x3c\x86\x1e\x75\xa5\x61\xc6\x97\x9f\x8d\x25\xf5\xc9\xcd\xde\xc9" | ||
566 | + "\x7d\x77\xf2\xc8\x7e\x70\xaf\x73\x5f\x2d\xec\xa2\x51\x2d\x96\xfb" | ||
567 | + "\x89\xad\x80\x57\xb2\x36\x1d\x7d\x83\x45\xac\xf3\xdb\xcc\x6c\x31" | ||
568 | + "\x4f\xcf\x30\x58\xd0\x12\x28\x90\x50\x42\x86\xfb\x48\x16\x3c\xc5" | ||
569 | + "\x9c\xf8\xe7\xcc\x29\x88\xb3\x4a\x4b\x4e\x6c\xbc\xdb\xc7\xbb\xe9" | ||
570 | + "\xb6\xa0\x8b\x11\xa1\x7d\x73\xd7\xe9\xbf\x7e\xc2\x6c\x10\x8d\xee" | ||
571 | + "\x9d\xef\x63\x3a\xe0\xf5\xbe\x8c\x3e\xa1\xc7\xc5\xd1\x00\x44\x1e" | ||
572 | + "\xf3\x51\xf2\xe2\xb0\xe3\xb5\x13\x7f\x32\xf1\x8c\xa6\x22\xfe\x1f" | ||
573 | + "\x49\x4d\xbb\xcf\x3a\x5d\xed\x4c\xd2\xfc\x85\xed\x23\xd6\xc7\x50" | ||
574 | + "\xb6\x5b\x3a\x16\x83\xb8\x6f\xfd\x32\x3f\xaa\x36\x34\xbb\xf5\x96" | ||
575 | + "\xa9\xab\xcf\x9f\x8f\xac\xc3\xca\xd5\x8b\xd8\x48\x9e\x79\xaa\x30" | ||
576 | + "\x87\xca\x58\x4d\x59\x96\xb9\x4f\xc5\x1b\x1c\xd2\xda\x5b\xe6\x57" | ||
577 | + "\x29\xa1\x28\x7a\x2b\x5b\xff\x00\x12\x2f\x5e\x3f\xf3\xbb\x8e\x7f" | ||
578 | + "\xec\xc6\x98\xff\x00\xed\x3c\xa6\xdd\xa9\xdc\x7e\xa0\xf7\xd6\x99" | ||
579 | + "\x31\xa2\xf7\xaf\x6b\xe9\x82\x74\x4b\x3d\x8f\x5e\x58\x0b\x33\xab" | ||
580 | + "\xef\xc3\xaf\x84\x64\xb9\xae\xb6\x25\x5f\x62\x8f\x1c\xe3\xf4\x51" | ||
581 | + "\xb7\x96\xe3\x0e\x30\x42\xa9\x18\x39\xbf\x9e\x2a\x1f\x74\x19\x02" | ||
582 | + "\x2d\x43\x93\x06\x63\xb1\xa7\x47\x6a\xfa\x9b\x6c\xeb\xbd\xe9\xae" | ||
583 | + "\x6a\x7b\x6f\x53\x5a\x60\x5d\xb5\xcd\xe8\x67\xeb\x35\x3b\x48\xc6" | ||
584 | + "\xa6\xb3\x04\xc8\xdf\xb8\x7e\x26\x64\xb0\xc9\x18\xb0\xa7\x33\xf2" | ||
585 | + "\x4a\x8b\x22\x3b\x8d\x4b\x89\x1d\xf6\x9d\x65\xc4\x38\xd2\x54\x9c" | ||
586 | + "\xe3\xcd\x89\xe1\xe1\xe6\x3e\x70\x81\x45\x1d\x18\xf9\x31\x83\xc8" | ||
587 | + "\xbe\x14\x82\x4b\x87\x7a\x74\x28\xd2\xdd\x12\x55\x30\xe6\x0e\x49" | ||
588 | + "\x31\x8e\x48\x69\xc5\xc0\x20\x91\xe4\x48\x41\x4c\xd8\xb9\x6a\x4e" | ||
589 | + "\x21\xce\x99\x1b\x0e\xfd\x09\x4f\xa1\x79\x0f\x0f\x0f\x0f\x0f\x0f" | ||
590 | + "\x0f\x3f\x3c\xb8\x71\x27\xc7\x72\x24\xe8\xb1\xa6\xc5\x7b\x18\xc3" | ||
591 | + "\xb1\xa5\xb0\xd4\x98\xee\xe3\x19\xc6\x71\x87\x19\x79\x2b\x6d\x78" | ||
592 | + "\xc6\x71\x8c\xe3\x0a\x4e\x71\x8c\xe3\x19\xfe\x38\xf2\x3b\xfb\x8b" | ||
593 | + "\x48\xfe\x4e\xaa\xff\x00\x4f\x08\xff\x00\xc7\xe1\xfb\x8b\x48\xfe" | ||
594 | + "\x4e\xaa\xff\x00\x4f\x08\xff\x00\xc7\xe4\x95\x86\x18\x8a\xcb\x31" | ||
595 | + "\xa3\x32\xd4\x78\xf1\xdb\x43\x2c\x47\x61\xb4\x32\xcb\x2c\xb4\x9c" | ||
596 | + "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1" | ||
597 | + "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9" | ||
598 | + ; | ||
599 | diff -Naur php-5.3.3/main/suhosin_patch.c php-5.3.3-magellan/main/suhosin_patch.c | ||
600 | --- php-5.3.3/main/suhosin_patch.c 1970-01-01 01:00:00.000000000 +0100 | ||
601 | +++ php-5.3.3-magellan/main/suhosin_patch.c 2010-07-26 12:11:25.000000000 +0200 | ||
602 | @@ -0,0 +1,470 @@ | ||
603 | +/* | ||
604 | + +----------------------------------------------------------------------+ | ||
605 | + | Suhosin Patch for PHP | | ||
606 | + +----------------------------------------------------------------------+ | ||
607 | + | Copyright (c) 2004-2010 Stefan Esser | | ||
608 | + +----------------------------------------------------------------------+ | ||
609 | + | This source file is subject to version 2.02 of the PHP license, | | ||
610 | + | that is bundled with this package in the file LICENSE, and is | | ||
611 | + | available at through the world-wide-web at | | ||
612 | + | http://www.php.net/license/2_02.txt. | | ||
613 | + | If you did not receive a copy of the PHP license and are unable to | | ||
614 | + | obtain it through the world-wide-web, please send a note to | | ||
615 | + | license@php.net so we can mail you a copy immediately. | | ||
616 | + +----------------------------------------------------------------------+ | ||
617 | + | Author: Stefan Esser <sesser@hardened-php.net> | | ||
618 | + +----------------------------------------------------------------------+ | ||
619 | + */ | ||
620 | +/* $Id: php5-5.3.3-suhosin-0.9.10-2.patch,v 1.1 2010-08-22 18:31:04 niro Exp $ */ | ||
621 | + | ||
622 | +#include "php.h" | ||
623 | + | ||
624 | +#include <stdio.h> | ||
625 | +#include <stdlib.h> | ||
626 | +#include <sys/mman.h> | ||
627 | + | ||
628 | +#if HAVE_UNISTD_H | ||
629 | +#include <unistd.h> | ||
630 | +#endif | ||
631 | +#include "SAPI.h" | ||
632 | +#include "php_globals.h" | ||
633 | + | ||
634 | +#if SUHOSIN_PATCH | ||
635 | + | ||
636 | +#ifdef HAVE_SYS_SOCKET_H | ||
637 | +#include <sys/socket.h> | ||
638 | +#endif | ||
639 | + | ||
640 | +#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE) | ||
641 | +#undef AF_UNIX | ||
642 | +#endif | ||
643 | + | ||
644 | +#if defined(AF_UNIX) | ||
645 | +#include <sys/un.h> | ||
646 | +#endif | ||
647 | + | ||
648 | +#define SYSLOG_PATH "/dev/log" | ||
649 | + | ||
650 | +#ifdef PHP_WIN32 | ||
651 | +static HANDLE log_source = 0; | ||
652 | +#endif | ||
653 | + | ||
654 | +#include "snprintf.h" | ||
655 | + | ||
656 | +#include "suhosin_patch.h" | ||
657 | + | ||
658 | +#ifdef ZTS | ||
659 | +#include "suhosin_globals.h" | ||
660 | +int suhosin_patch_globals_id; | ||
661 | +#else | ||
662 | +struct _suhosin_patch_globals suhosin_patch_globals; | ||
663 | +#endif | ||
664 | + | ||
665 | +static char *suhosin_config = NULL; | ||
666 | + | ||
667 | +static zend_intptr_t SUHOSIN_POINTER_GUARD = 0; | ||
668 | + | ||
669 | +static void php_security_log(int loglevel, char *fmt, ...); | ||
670 | + | ||
671 | +static void suhosin_patch_globals_ctor(suhosin_patch_globals_struct *suhosin_patch_globals TSRMLS_DC) | ||
672 | +{ | ||
673 | + memset(suhosin_patch_globals, 0, sizeof(*suhosin_patch_globals)); | ||
674 | +} | ||
675 | + | ||
676 | +ZEND_API char suhosin_get_config(int element) | ||
677 | +{ | ||
678 | + return ((char *)SUHOSIN_MANGLE_PTR(suhosin_config))[element]; | ||
679 | +} | ||
680 | + | ||
681 | +static void suhosin_set_config(int element, char value) | ||
682 | +{ | ||
683 | + ((char *)SUHOSIN_MANGLE_PTR(suhosin_config))[element] = value; | ||
684 | +} | ||
685 | + | ||
686 | +static void suhosin_read_configuration_from_environment() | ||
687 | +{ | ||
688 | + char *tmp; | ||
689 | + | ||
690 | + /* check if canary protection should be activated or not */ | ||
691 | + tmp = getenv("SUHOSIN_MM_USE_CANARY_PROTECTION"); | ||
692 | + /* default to activated */ | ||
693 | + suhosin_set_config(SUHOSIN_MM_USE_CANARY_PROTECTION, 1); | ||
694 | + if (tmp) { | ||
695 | + int flag = zend_atoi(tmp, 0); | ||
696 | + suhosin_set_config(SUHOSIN_MM_USE_CANARY_PROTECTION, flag); | ||
697 | + } | ||
698 | + | ||
699 | + /* check if free memory should be overwritten with 0xFF or not */ | ||
700 | + tmp = getenv("SUHOSIN_MM_DESTROY_FREE_MEMORY"); | ||
701 | + /* default to deactivated */ | ||
702 | + suhosin_set_config(SUHOSIN_MM_DESTROY_FREE_MEMORY, 0); | ||
703 | + if (tmp) { | ||
704 | + int flag = zend_atoi(tmp, 0); | ||
705 | + suhosin_set_config(SUHOSIN_MM_DESTROY_FREE_MEMORY, flag); | ||
706 | + } | ||
707 | + | ||
708 | + /* check if canary violations should be ignored */ | ||
709 | + tmp = getenv("SUHOSIN_MM_IGNORE_CANARY_VIOLATION"); | ||
710 | + /* default to NOT ignore */ | ||
711 | + suhosin_set_config(SUHOSIN_MM_IGNORE_CANARY_VIOLATION, 0); | ||
712 | + if (tmp) { | ||
713 | + int flag = zend_atoi(tmp, 0); | ||
714 | + suhosin_set_config(SUHOSIN_MM_IGNORE_CANARY_VIOLATION, flag); | ||
715 | + } | ||
716 | + | ||
717 | + /* check if invalid hashtable destructors should be ignored */ | ||
718 | + tmp = getenv("SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR"); | ||
719 | + /* default to NOT ignore */ | ||
720 | + suhosin_set_config(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR, 0); | ||
721 | + if (tmp) { | ||
722 | + int flag = zend_atoi(tmp, 0); | ||
723 | + suhosin_set_config(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR, flag); | ||
724 | + } | ||
725 | + | ||
726 | + /* check if invalid linkedlist destructors should be ignored */ | ||
727 | + tmp = getenv("SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR"); | ||
728 | + /* default to NOT ignore */ | ||
729 | + suhosin_set_config(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR, 0); | ||
730 | + if (tmp) { | ||
731 | + int flag = zend_atoi(tmp, 0); | ||
732 | + suhosin_set_config(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR, flag); | ||
733 | + } | ||
734 | + | ||
735 | + suhosin_set_config(SUHOSIN_CONFIG_SET, 1); | ||
736 | +} | ||
737 | + | ||
738 | +static void suhosin_write_protect_configuration() | ||
739 | +{ | ||
740 | + /* check return value of mprotect() to ensure memory is read only now */ | ||
741 | + if (mprotect(SUHOSIN_MANGLE_PTR(suhosin_config), sysconf(_SC_PAGESIZE), PROT_READ) != 0) { | ||
742 | + perror("suhosin"); | ||
743 | + _exit(1); | ||
744 | + } | ||
745 | +} | ||
746 | + | ||
747 | +PHPAPI void suhosin_startup() | ||
748 | +{ | ||
749 | +#ifdef ZTS | ||
750 | + ts_allocate_id(&suhosin_patch_globals_id, sizeof(suhosin_patch_globals_struct), (ts_allocate_ctor) suhosin_patch_globals_ctor, NULL); | ||
751 | +#else | ||
752 | + suhosin_patch_globals_ctor(&suhosin_patch_globals TSRMLS_CC); | ||
753 | +#endif | ||
754 | + zend_suhosin_log = php_security_log; | ||
755 | + | ||
756 | + /* get the pointer guardian and ensure low 3 bits are 1 */ | ||
757 | + if (SUHOSIN_POINTER_GUARD == 0) { | ||
758 | + zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD)); | ||
759 | + SUHOSIN_POINTER_GUARD |= 7; | ||
760 | + } | ||
761 | + | ||
762 | + if (!suhosin_config) { | ||
763 | +#ifndef MAP_ANONYMOUS | ||
764 | +#define MAP_ANONYMOUS MAP_ANON | ||
765 | +#endif | ||
766 | + suhosin_config = mmap(NULL, sysconf(_SC_PAGESIZE), PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); | ||
767 | + if (suhosin_config == MAP_FAILED) { | ||
768 | + perror("suhosin"); | ||
769 | + _exit(1); | ||
770 | + } | ||
771 | + suhosin_config = SUHOSIN_MANGLE_PTR(suhosin_config); | ||
772 | + } | ||
773 | + if (!SUHOSIN_CONFIG(SUHOSIN_CONFIG_SET)) { | ||
774 | + suhosin_read_configuration_from_environment(); | ||
775 | + suhosin_write_protect_configuration(); | ||
776 | + } | ||
777 | +} | ||
778 | + | ||
779 | +static char *loglevel2string(int loglevel) | ||
780 | +{ | ||
781 | + switch (loglevel) { | ||
782 | + case S_FILES: | ||
783 | + return "FILES"; | ||
784 | + case S_INCLUDE: | ||
785 | + return "INCLUDE"; | ||
786 | + case S_MEMORY: | ||
787 | + return "MEMORY"; | ||
788 | + case S_MISC: | ||
789 | + return "MISC"; | ||
790 | + case S_SESSION: | ||
791 | + return "SESSION"; | ||
792 | + case S_SQL: | ||
793 | + return "SQL"; | ||
794 | + case S_EXECUTOR: | ||
795 | + return "EXECUTOR"; | ||
796 | + case S_VARS: | ||
797 | + return "VARS"; | ||
798 | + default: | ||
799 | + return "UNKNOWN"; | ||
800 | + } | ||
801 | +} | ||
802 | + | ||
803 | +static void php_security_log(int loglevel, char *fmt, ...) | ||
804 | +{ | ||
805 | + int s, r, i=0; | ||
806 | +#if defined(AF_UNIX) | ||
807 | + struct sockaddr_un saun; | ||
808 | +#endif | ||
809 | +#ifdef PHP_WIN32 | ||
810 | + LPTSTR strs[2]; | ||
811 | + unsigned short etype; | ||
812 | + DWORD evid; | ||
813 | +#endif | ||
814 | + char buf[4096+64]; | ||
815 | + char error[4096+100]; | ||
816 | + char *ip_address; | ||
817 | + char *fname; | ||
818 | + char *alertstring; | ||
819 | + int lineno; | ||
820 | + va_list ap; | ||
821 | + TSRMLS_FETCH(); | ||
822 | + | ||
823 | + /*SDEBUG("(suhosin_log) loglevel: %d log_syslog: %u - log_sapi: %u - log_script: %u", loglevel, SPG(log_syslog), SPG(log_sapi), SPG(log_script));*/ | ||
824 | + | ||
825 | + if (SPG(log_use_x_forwarded_for)) { | ||
826 | + ip_address = sapi_getenv("HTTP_X_FORWARDED_FOR", 20 TSRMLS_CC); | ||
827 | + if (ip_address == NULL) { | ||
828 | + ip_address = "X-FORWARDED-FOR not set"; | ||
829 | + } | ||
830 | + } else { | ||
831 | + ip_address = sapi_getenv("REMOTE_ADDR", 11 TSRMLS_CC); | ||
832 | + if (ip_address == NULL) { | ||
833 | + ip_address = "REMOTE_ADDR not set"; | ||
834 | + } | ||
835 | + } | ||
836 | + | ||
837 | + | ||
838 | + va_start(ap, fmt); | ||
839 | + ap_php_vsnprintf(error, sizeof(error), fmt, ap); | ||
840 | + va_end(ap); | ||
841 | + while (error[i]) { | ||
842 | + if (error[i] < 32) error[i] = '.'; | ||
843 | + i++; | ||
844 | + } | ||
845 | + | ||
846 | +/* if (SPG(simulation)) { | ||
847 | + alertstring = "ALERT-SIMULATION"; | ||
848 | + } else { */ | ||
849 | + alertstring = "ALERT"; | ||
850 | +/* }*/ | ||
851 | + | ||
852 | + if (zend_is_executing(TSRMLS_C)) { | ||
853 | + if (EG(current_execute_data)) { | ||
854 | + lineno = EG(current_execute_data)->opline->lineno; | ||
855 | + fname = EG(current_execute_data)->op_array->filename; | ||
856 | + } else { | ||
857 | + lineno = zend_get_executed_lineno(TSRMLS_C); | ||
858 | + fname = zend_get_executed_filename(TSRMLS_C); | ||
859 | + } | ||
860 | + ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s', line %u)", alertstring, error, ip_address, fname, lineno); | ||
861 | + } else { | ||
862 | + fname = sapi_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC); | ||
863 | + if (fname==NULL) { | ||
864 | + fname = "unknown"; | ||
865 | + } | ||
866 | + ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s')", alertstring, error, ip_address, fname); | ||
867 | + } | ||
868 | + | ||
869 | + /* Syslog-Logging disabled? */ | ||
870 | + if (((SPG(log_syslog)|S_INTERNAL) & loglevel)==0) { | ||
871 | + goto log_sapi; | ||
872 | + } | ||
873 | + | ||
874 | +#if defined(AF_UNIX) | ||
875 | + ap_php_snprintf(error, sizeof(error), "<%u>suhosin[%u]: %s\n", (unsigned int)(SPG(log_syslog_facility)|SPG(log_syslog_priority)),getpid(),buf); | ||
876 | + | ||
877 | + s = socket(AF_UNIX, SOCK_DGRAM, 0); | ||
878 | + if (s == -1) { | ||
879 | + goto log_sapi; | ||
880 | + } | ||
881 | + | ||
882 | + memset(&saun, 0, sizeof(saun)); | ||
883 | + saun.sun_family = AF_UNIX; | ||
884 | + strcpy(saun.sun_path, SYSLOG_PATH); | ||
885 | + /*saun.sun_len = sizeof(saun);*/ | ||
886 | + | ||
887 | + r = connect(s, (struct sockaddr *)&saun, sizeof(saun)); | ||
888 | + if (r) { | ||
889 | + close(s); | ||
890 | + s = socket(AF_UNIX, SOCK_STREAM, 0); | ||
891 | + if (s == -1) { | ||
892 | + goto log_sapi; | ||
893 | + } | ||
894 | + | ||
895 | + memset(&saun, 0, sizeof(saun)); | ||
896 | + saun.sun_family = AF_UNIX; | ||
897 | + strcpy(saun.sun_path, SYSLOG_PATH); | ||
898 | + /*saun.sun_len = sizeof(saun);*/ | ||
899 | + | ||
900 | + r = connect(s, (struct sockaddr *)&saun, sizeof(saun)); | ||
901 | + if (r) { | ||
902 | + close(s); | ||
903 | + goto log_sapi; | ||
904 | + } | ||
905 | + } | ||
906 | + send(s, error, strlen(error), 0); | ||
907 | + | ||
908 | + close(s); | ||
909 | +#endif | ||
910 | +#ifdef PHP_WIN32 | ||
911 | + ap_php_snprintf(error, sizeof(error), "suhosin[%u]: %s", getpid(),buf); | ||
912 | + | ||
913 | + switch (SPG(log_syslog_priority)) { /* translate UNIX type into NT type */ | ||
914 | + case 1: /*LOG_ALERT:*/ | ||
915 | + etype = EVENTLOG_ERROR_TYPE; | ||
916 | + break; | ||
917 | + case 6: /*LOG_INFO:*/ | ||
918 | + etype = EVENTLOG_INFORMATION_TYPE; | ||
919 | + break; | ||
920 | + default: | ||
921 | + etype = EVENTLOG_WARNING_TYPE; | ||
922 | + } | ||
923 | + evid = loglevel; | ||
924 | + strs[0] = error; | ||
925 | + /* report the event */ | ||
926 | + if (log_source == NULL) { | ||
927 | + log_source = RegisterEventSource(NULL, "Suhosin-Patch-" SUHOSIN_PATCH_VERSION); | ||
928 | + } | ||
929 | + ReportEvent(log_source, etype, (unsigned short) SPG(log_syslog_priority), evid, NULL, 1, 0, strs, NULL); | ||
930 | + | ||
931 | +#endif | ||
932 | +log_sapi: | ||
933 | + /* SAPI Logging activated? */ | ||
934 | + /*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));*/ | ||
935 | + if (((SPG(log_sapi)|S_INTERNAL) & loglevel)!=0) { | ||
936 | + sapi_module.log_message(buf); | ||
937 | + } | ||
938 | + | ||
939 | +/*log_script:*/ | ||
940 | + /* script logging activaed? */ | ||
941 | + if (((SPG(log_script) & loglevel)!=0) && SPG(log_scriptname)!=NULL) { | ||
942 | + char cmd[8192], *cmdpos, *bufpos; | ||
943 | + FILE *in; | ||
944 | + int space; | ||
945 | + | ||
946 | + ap_php_snprintf(cmd, sizeof(cmd), "%s %s \'", SPG(log_scriptname), loglevel2string(loglevel)); | ||
947 | + space = sizeof(cmd) - strlen(cmd); | ||
948 | + cmdpos = cmd + strlen(cmd); | ||
949 | + bufpos = buf; | ||
950 | + if (space <= 1) return; | ||
951 | + while (space > 2 && *bufpos) { | ||
952 | + if (*bufpos == '\'') { | ||
953 | + if (space<=5) break; | ||
954 | + *cmdpos++ = '\''; | ||
955 | + *cmdpos++ = '\\'; | ||
956 | + *cmdpos++ = '\''; | ||
957 | + *cmdpos++ = '\''; | ||
958 | + bufpos++; | ||
959 | + space-=4; | ||
960 | + } else { | ||
961 | + *cmdpos++ = *bufpos++; | ||
962 | + space--; | ||
963 | + } | ||
964 | + } | ||
965 | + *cmdpos++ = '\''; | ||
966 | + *cmdpos = 0; | ||
967 | + | ||
968 | + if ((in=VCWD_POPEN(cmd, "r"))==NULL) { | ||
969 | + php_security_log(S_INTERNAL, "Unable to execute logging shell script: %s", SPG(log_scriptname)); | ||
970 | + return; | ||
971 | + } | ||
972 | + /* read and forget the result */ | ||
973 | + while (1) { | ||
974 | + int readbytes = fread(cmd, 1, sizeof(cmd), in); | ||
975 | + if (readbytes<=0) { | ||
976 | + break; | ||
977 | + } | ||
978 | + } | ||
979 | + pclose(in); | ||
980 | + } | ||
981 | +/*log_phpscript:*/ | ||
982 | + if ((SPG(log_phpscript) & loglevel)!=0 && EG(in_execution) && SPG(log_phpscriptname) && SPG(log_phpscriptname)[0]) { | ||
983 | + zend_file_handle file_handle; | ||
984 | + zend_op_array *new_op_array; | ||
985 | + zval *result = NULL; | ||
986 | + | ||
987 | + /*long orig_execution_depth = SPG(execution_depth);*/ | ||
988 | + zend_bool orig_safe_mode = PG(safe_mode); | ||
989 | + char *orig_basedir = PG(open_basedir); | ||
990 | + | ||
991 | + char *phpscript = SPG(log_phpscriptname); | ||
992 | +/*SDEBUG("scriptname %s", SPG(log_phpscriptname));`*/ | ||
993 | +#ifdef ZEND_ENGINE_2 | ||
994 | + if (zend_stream_open(phpscript, &file_handle TSRMLS_CC) == SUCCESS) { | ||
995 | +#else | ||
996 | + if (zend_open(phpscript, &file_handle) == SUCCESS && ZEND_IS_VALID_FILE_HANDLE(&file_handle)) { | ||
997 | + file_handle.filename = phpscript; | ||
998 | + file_handle.free_filename = 0; | ||
999 | +#endif | ||
1000 | + if (!file_handle.opened_path) { | ||
1001 | + file_handle.opened_path = estrndup(phpscript, strlen(phpscript)); | ||
1002 | + } | ||
1003 | + new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE TSRMLS_CC); | ||
1004 | + zend_destroy_file_handle(&file_handle TSRMLS_CC); | ||
1005 | + if (new_op_array) { | ||
1006 | + HashTable *active_symbol_table = EG(active_symbol_table); | ||
1007 | + zval *zerror, *zerror_class; | ||
1008 | + | ||
1009 | + if (active_symbol_table == NULL) { | ||
1010 | + active_symbol_table = &EG(symbol_table); | ||
1011 | + } | ||
1012 | + EG(return_value_ptr_ptr) = &result; | ||
1013 | + EG(active_op_array) = new_op_array; | ||
1014 | + | ||
1015 | + MAKE_STD_ZVAL(zerror); | ||
1016 | + MAKE_STD_ZVAL(zerror_class); | ||
1017 | + ZVAL_STRING(zerror, buf, 1); | ||
1018 | + ZVAL_LONG(zerror_class, loglevel); | ||
1019 | + | ||
1020 | + zend_hash_update(active_symbol_table, "SUHOSIN_ERROR", sizeof("SUHOSIN_ERROR"), (void **)&zerror, sizeof(zval *), NULL); | ||
1021 | + zend_hash_update(active_symbol_table, "SUHOSIN_ERRORCLASS", sizeof("SUHOSIN_ERRORCLASS"), (void **)&zerror_class, sizeof(zval *), NULL); | ||
1022 | + | ||
1023 | + /*SPG(execution_depth) = 0;*/ | ||
1024 | + if (SPG(log_phpscript_is_safe)) { | ||
1025 | + PG(safe_mode) = 0; | ||
1026 | + PG(open_basedir) = NULL; | ||
1027 | + } | ||
1028 | + | ||
1029 | + zend_execute(new_op_array TSRMLS_CC); | ||
1030 | + | ||
1031 | + /*SPG(execution_depth) = orig_execution_depth;*/ | ||
1032 | + PG(safe_mode) = orig_safe_mode; | ||
1033 | + PG(open_basedir) = orig_basedir; | ||
1034 | + | ||
1035 | +#ifdef ZEND_ENGINE_2 | ||
1036 | + destroy_op_array(new_op_array TSRMLS_CC); | ||
1037 | +#else | ||
1038 | + destroy_op_array(new_op_array); | ||
1039 | +#endif | ||
1040 | + efree(new_op_array); | ||
1041 | +#ifdef ZEND_ENGINE_2 | ||
1042 | + if (!EG(exception)) | ||
1043 | +#endif | ||
1044 | + { | ||
1045 | + if (EG(return_value_ptr_ptr)) { | ||
1046 | + zval_ptr_dtor(EG(return_value_ptr_ptr)); | ||
1047 | + EG(return_value_ptr_ptr) = NULL; | ||
1048 | + } | ||
1049 | + } | ||
1050 | + } else { | ||
1051 | + php_security_log(S_INTERNAL, "Unable to execute logging PHP script: %s", SPG(log_phpscriptname)); | ||
1052 | + return; | ||
1053 | + } | ||
1054 | + } else { | ||
1055 | + php_security_log(S_INTERNAL, "Unable to execute logging PHP script: %s", SPG(log_phpscriptname)); | ||
1056 | + return; | ||
1057 | + } | ||
1058 | + } | ||
1059 | + | ||
1060 | +} | ||
1061 | + | ||
1062 | + | ||
1063 | +#endif | ||
1064 | + | ||
1065 | +/* | ||
1066 | + * Local variables: | ||
1067 | + * tab-width: 4 | ||
1068 | + * c-basic-offset: 4 | ||
1069 | + * End: | ||
1070 | + * vim600: sw=4 ts=4 fdm=marker | ||
1071 | + * vim<600: sw=4 ts=4 | ||
1072 | + */ | ||
1073 | diff -Naur php-5.3.3/main/suhosin_patch.h php-5.3.3-magellan/main/suhosin_patch.h | ||
1074 | --- php-5.3.3/main/suhosin_patch.h 1970-01-01 01:00:00.000000000 +0100 | ||
1075 | +++ php-5.3.3-magellan/main/suhosin_patch.h 2010-07-26 12:11:25.000000000 +0200 | ||
1076 | @@ -0,0 +1,59 @@ | ||
1077 | +/* | ||
1078 | + +----------------------------------------------------------------------+ | ||
1079 | + | Suhosin Patch for PHP | | ||
1080 | + +----------------------------------------------------------------------+ | ||
1081 | + | Copyright (c) 2004-2010 Stefan Esser | | ||
1082 | + +----------------------------------------------------------------------+ | ||
1083 | + | This source file is subject to version 2.02 of the PHP license, | | ||
1084 | + | that is bundled with this package in the file LICENSE, and is | | ||
1085 | + | available at through the world-wide-web at | | ||
1086 | + | http://www.php.net/license/2_02.txt. | | ||
1087 | + | If you did not receive a copy of the PHP license and are unable to | | ||
1088 | + | obtain it through the world-wide-web, please send a note to | | ||
1089 | + | license@php.net so we can mail you a copy immediately. | | ||
1090 | + +----------------------------------------------------------------------+ | ||
1091 | + | Author: Stefan Esser <stefan.esser@sektioneins.de> | | ||
1092 | + +----------------------------------------------------------------------+ | ||
1093 | + */ | ||
1094 | + | ||
1095 | +#ifndef SUHOSIN_PATCH_H | ||
1096 | +#define SUHOSIN_PATCH_H | ||
1097 | + | ||
1098 | +#if SUHOSIN_PATCH | ||
1099 | + | ||
1100 | +#include "zend.h" | ||
1101 | + | ||
1102 | +#define SUHOSIN_PATCH_VERSION "0.9.10" | ||
1103 | + | ||
1104 | +#define SUHOSIN_LOGO_GUID "SUHO8567F54-D428-14d2-A769-00DA302A5F18" | ||
1105 | + | ||
1106 | +#define SUHOSIN_CONFIG(idx) (suhosin_get_config(idx)) | ||
1107 | + | ||
1108 | +#define SUHOSIN_MM_USE_CANARY_PROTECTION 0 | ||
1109 | +#define SUHOSIN_MM_DESTROY_FREE_MEMORY 1 | ||
1110 | +#define SUHOSIN_MM_IGNORE_CANARY_VIOLATION 2 | ||
1111 | +#define SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR 3 | ||
1112 | +#define SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR 4 | ||
1113 | + | ||
1114 | +#define SUHOSIN_CONFIG_SET 100 | ||
1115 | + | ||
1116 | +#include <sys/types.h> | ||
1117 | +#include <sys/stat.h> | ||
1118 | +#include <sys/mman.h> | ||
1119 | + | ||
1120 | +#if defined(DARWIN) | ||
1121 | +#include <mach/vm_param.h> | ||
1122 | +#endif | ||
1123 | + | ||
1124 | +#define SUHOSIN_MANGLE_PTR(ptr) (ptr==NULL?NULL:((void *)((zend_intptr_t)(ptr)^SUHOSIN_POINTER_GUARD))) | ||
1125 | + | ||
1126 | +#endif | ||
1127 | + | ||
1128 | +#endif /* SUHOSIN_PATCH_H */ | ||
1129 | + | ||
1130 | +/* | ||
1131 | + * Local variables: | ||
1132 | + * tab-width: 4 | ||
1133 | + * c-basic-offset: 4 | ||
1134 | + * End: | ||
1135 | + */ | ||
1136 | diff -Naur php-5.3.3/main/suhosin_patch.m4 php-5.3.3-magellan/main/suhosin_patch.m4 | ||
1137 | --- php-5.3.3/main/suhosin_patch.m4 1970-01-01 01:00:00.000000000 +0100 | ||
1138 | +++ php-5.3.3-magellan/main/suhosin_patch.m4 2010-07-26 12:11:25.000000000 +0200 | ||
1139 | @@ -0,0 +1,8 @@ | ||
1140 | +dnl | ||
1141 | +dnl $Id: php5-5.3.3-suhosin-0.9.10-2.patch,v 1.1 2010-08-22 18:31:04 niro Exp $ | ||
1142 | +dnl | ||
1143 | +dnl This file contains Suhosin Patch for PHP specific autoconf functions. | ||
1144 | +dnl | ||
1145 | + | ||
1146 | +AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch]) | ||
1147 | + | ||
1148 | diff -Naur php-5.3.3/sapi/apache/mod_php5.c php-5.3.3-magellan/sapi/apache/mod_php5.c | ||
1149 | --- php-5.3.3/sapi/apache/mod_php5.c 2010-03-12 11:28:59.000000000 +0100 | ||
1150 | +++ php-5.3.3-magellan/sapi/apache/mod_php5.c 2010-07-26 12:11:25.000000000 +0200 | ||
1151 | @@ -969,7 +969,11 @@ | ||
1152 | { | ||
1153 | TSRMLS_FETCH(); | ||
1154 | if (PG(expose_php)) { | ||
1155 | +#if SUHOSIN_PATCH | ||
1156 | + ap_add_version_component("PHP/" PHP_VERSION " with Suhosin-Patch"); | ||
1157 | +#else | ||
1158 | ap_add_version_component("PHP/" PHP_VERSION); | ||
1159 | +#endif | ||
1160 | } | ||
1161 | } | ||
1162 | #endif | ||
1163 | diff -Naur php-5.3.3/sapi/apache2filter/sapi_apache2.c php-5.3.3-magellan/sapi/apache2filter/sapi_apache2.c | ||
1164 | --- php-5.3.3/sapi/apache2filter/sapi_apache2.c 2010-02-05 19:59:05.000000000 +0100 | ||
1165 | +++ php-5.3.3-magellan/sapi/apache2filter/sapi_apache2.c 2010-07-26 12:11:25.000000000 +0200 | ||
1166 | @@ -583,7 +583,11 @@ | ||
1167 | { | ||
1168 | TSRMLS_FETCH(); | ||
1169 | if (PG(expose_php)) { | ||
1170 | +#if SUHOSIN_PATCH | ||
1171 | + ap_add_version_component(p, "PHP/" PHP_VERSION " with Suhosin-Patch"); | ||
1172 | +#else | ||
1173 | ap_add_version_component(p, "PHP/" PHP_VERSION); | ||
1174 | +#endif | ||
1175 | } | ||
1176 | } | ||
1177 | |||
1178 | diff -Naur php-5.3.3/sapi/apache2handler/sapi_apache2.c php-5.3.3-magellan/sapi/apache2handler/sapi_apache2.c | ||
1179 | --- php-5.3.3/sapi/apache2handler/sapi_apache2.c 2010-05-04 11:51:03.000000000 +0200 | ||
1180 | +++ php-5.3.3-magellan/sapi/apache2handler/sapi_apache2.c 2010-07-26 12:11:25.000000000 +0200 | ||
1181 | @@ -407,7 +407,11 @@ | ||
1182 | { | ||
1183 | TSRMLS_FETCH(); | ||
1184 | if (PG(expose_php)) { | ||
1185 | +#if SUHOSIN_PATCH | ||
1186 | + ap_add_version_component(p, "PHP/" PHP_VERSION " with Suhosin-Patch"); | ||
1187 | +#else | ||
1188 | ap_add_version_component(p, "PHP/" PHP_VERSION); | ||
1189 | +#endif | ||
1190 | } | ||
1191 | } | ||
1192 | |||
1193 | diff -Naur php-5.3.3/sapi/apache_hooks/mod_php5.c php-5.3.3-magellan/sapi/apache_hooks/mod_php5.c | ||
1194 | --- php-5.3.3/sapi/apache_hooks/mod_php5.c 2010-03-12 11:28:59.000000000 +0100 | ||
1195 | +++ php-5.3.3-magellan/sapi/apache_hooks/mod_php5.c 2010-07-26 12:11:25.000000000 +0200 | ||
1196 | @@ -1256,7 +1256,11 @@ | ||
1197 | { | ||
1198 | TSRMLS_FETCH(); | ||
1199 | if (PG(expose_php)) { | ||
1200 | +#if SUHOSIN_PATCH | ||
1201 | + ap_add_version_component("PHP/" PHP_VERSION " with Suhosin-Patch"); | ||
1202 | +#else | ||
1203 | ap_add_version_component("PHP/" PHP_VERSION); | ||
1204 | +#endif | ||
1205 | } | ||
1206 | } | ||
1207 | #endif | ||
1208 | diff -Naur php-5.3.3/sapi/cgi/cgi_main.c php-5.3.3-magellan/sapi/cgi/cgi_main.c | ||
1209 | --- php-5.3.3/sapi/cgi/cgi_main.c 2010-06-29 13:37:13.000000000 +0200 | ||
1210 | +++ php-5.3.3-magellan/sapi/cgi/cgi_main.c 2010-07-26 12:11:25.000000000 +0200 | ||
1211 | @@ -1929,10 +1929,18 @@ | ||
1212 | SG(headers_sent) = 1; | ||
1213 | SG(request_info).no_headers = 1; | ||
1214 | } | ||
1215 | +#if SUHOSIN_PATCH | ||
1216 | #if ZEND_DEBUG | ||
1217 | - php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1218 | + php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1219 | #else | ||
1220 | - php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1221 | + php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1222 | +#endif | ||
1223 | +#else | ||
1224 | + #if ZEND_DEBUG | ||
1225 | + php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1226 | + #else | ||
1227 | + php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1228 | + #endif | ||
1229 | #endif | ||
1230 | php_request_shutdown((void *) 0); | ||
1231 | fcgi_shutdown(); | ||
1232 | diff -Naur php-5.3.3/sapi/cli/php_cli.c php-5.3.3-magellan/sapi/cli/php_cli.c | ||
1233 | --- php-5.3.3/sapi/cli/php_cli.c 2010-06-29 13:37:13.000000000 +0200 | ||
1234 | +++ php-5.3.3-magellan/sapi/cli/php_cli.c 2010-07-26 12:11:25.000000000 +0200 | ||
1235 | @@ -831,7 +831,11 @@ | ||
1236 | } | ||
1237 | |||
1238 | request_started = 1; | ||
1239 | - php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2010 The PHP Group\n%s", | ||
1240 | + php_printf("PHP %s " | ||
1241 | +#if SUHOSIN_PATCH | ||
1242 | + "with Suhosin-Patch " | ||
1243 | +#endif | ||
1244 | + "(%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s", | ||
1245 | PHP_VERSION, sapi_module.name, __DATE__, __TIME__, | ||
1246 | #if ZEND_DEBUG && defined(HAVE_GCOV) | ||
1247 | "(DEBUG GCOV)", | ||
1248 | diff -Naur php-5.3.3/sapi/litespeed/lsapi_main.c php-5.3.3-magellan/sapi/litespeed/lsapi_main.c | ||
1249 | --- php-5.3.3/sapi/litespeed/lsapi_main.c 2010-06-26 18:03:39.000000000 +0200 | ||
1250 | +++ php-5.3.3-magellan/sapi/litespeed/lsapi_main.c 2010-07-26 12:11:25.000000000 +0200 | ||
1251 | @@ -545,11 +545,19 @@ | ||
1252 | break; | ||
1253 | case 'v': | ||
1254 | if (php_request_startup(TSRMLS_C) != FAILURE) { | ||
1255 | +#if SUHOSIN_PATCH | ||
1256 | +#if ZEND_DEBUG | ||
1257 | + php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1258 | +#else | ||
1259 | + php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1260 | +#endif | ||
1261 | +#else | ||
1262 | #if ZEND_DEBUG | ||
1263 | php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1264 | #else | ||
1265 | php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1266 | #endif | ||
1267 | +#endif | ||
1268 | #ifdef PHP_OUTPUT_NEWAPI | ||
1269 | php_output_end_all(TSRMLS_C); | ||
1270 | #else | ||
1271 | diff -Naur php-5.3.3/sapi/milter/php_milter.c php-5.3.3-magellan/sapi/milter/php_milter.c | ||
1272 | --- php-5.3.3/sapi/milter/php_milter.c 2010-03-12 11:28:59.000000000 +0100 | ||
1273 | +++ php-5.3.3-magellan/sapi/milter/php_milter.c 2010-07-26 12:11:25.000000000 +0200 | ||
1274 | @@ -1111,7 +1111,11 @@ | ||
1275 | } | ||
1276 | SG(headers_sent) = 1; | ||
1277 | SG(request_info).no_headers = 1; | ||
1278 | - php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1279 | +#if SUHOSIN_PATCH | ||
1280 | + php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1281 | +#else | ||
1282 | + php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | ||
1283 | +#endif | ||
1284 | php_end_ob_buffers(1 TSRMLS_CC); | ||
1285 | exit(1); | ||
1286 | break; | ||
1287 | diff -Naur php-5.3.3/win32/build/config.w32 php-5.3.3-magellan/win32/build/config.w32 | ||
1288 | --- php-5.3.3/win32/build/config.w32 2009-12-03 12:50:32.000000000 +0100 | ||
1289 | +++ php-5.3.3-magellan/win32/build/config.w32 2010-07-26 12:11:25.000000000 +0200 | ||
1290 | @@ -325,7 +325,7 @@ | ||
1291 | zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ | ||
1292 | zend_object_handlers.c zend_objects_API.c \ | ||
1293 | zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \ | ||
1294 | - zend_float.c"); | ||
1295 | + zend_float.c zend_canary.c zend_alloc_canary.c"); | ||
1296 | |||
1297 | if (VCVERS == 1200) { | ||
1298 | AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1); | ||
1299 | @@ -380,6 +380,7 @@ | ||
1300 | |||
1301 | AC_DEFINE('HAVE_USLEEP', 1); | ||
1302 | AC_DEFINE('HAVE_STRCOLL', 1); | ||
1303 | +AC_DEFINE('SUHOSIN_PATCH', 1); | ||
1304 | |||
1305 | /* For snapshot builders, where can we find the additional | ||
1306 | * files that make up the snapshot template? */ | ||
1307 | diff -Naur php-5.3.3/win32/build/config.w32.h.in php-5.3.3-magellan/win32/build/config.w32.h.in | ||
1308 | --- php-5.3.3/win32/build/config.w32.h.in 2009-12-10 15:08:19.000000000 +0100 | ||
1309 | +++ php-5.3.3-magellan/win32/build/config.w32.h.in 2010-07-26 12:11:25.000000000 +0200 | ||
1310 | @@ -151,6 +151,9 @@ | ||
1311 | /* Win32 supports strcoll */ | ||
1312 | #define HAVE_STRCOLL 1 | ||
1313 | |||
1314 | +/* Suhosin Patch support */ | ||
1315 | +#define SUHOSIN_PATCH 1 | ||
1316 | + | ||
1317 | /* Win32 supports socketpair by the emulation in win32/sockets.c */ | ||
1318 | #define HAVE_SOCKETPAIR 1 | ||
1319 | #define HAVE_SOCKLEN_T 1 | ||
1320 | diff -Naur php-5.3.3/win32/pws-php5cgi.reg php-5.3.3-magellan/win32/pws-php5cgi.reg | ||
1321 | --- php-5.3.3/win32/pws-php5cgi.reg 2007-09-26 17:44:16.000000000 +0200 | ||
1322 | +++ php-5.3.3-magellan/win32/pws-php5cgi.reg 1970-01-01 01:00:00.000000000 +0100 | ||
1323 | @@ -1,6 +0,0 @@ | ||
1324 | -REGEDIT4 | ||
1325 | - | ||
1326 | -[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\w3svc\parameters\Script Map] | ||
1327 | -".php"="[PUT PATH HERE]\\php.exe" | ||
1328 | - | ||
1329 | - | ||
1330 | diff -Naur php-5.3.3/win32/pws-php5isapi.reg php-5.3.3-magellan/win32/pws-php5isapi.reg | ||
1331 | --- php-5.3.3/win32/pws-php5isapi.reg 2007-09-26 17:44:16.000000000 +0200 | ||
1332 | +++ php-5.3.3-magellan/win32/pws-php5isapi.reg 1970-01-01 01:00:00.000000000 +0100 | ||
1333 | @@ -1,5 +0,0 @@ | ||
1334 | -REGEDIT4 | ||
1335 | - | ||
1336 | -[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\w3svc\parameters\Script Map] | ||
1337 | -".php"="[PUT PATH HERE]\\php5isapi.dll" | ||
1338 | - | ||
1339 | diff -Naur php-5.3.3/win32/syslog.reg php-5.3.3-magellan/win32/syslog.reg | ||
1340 | --- php-5.3.3/win32/syslog.reg 2007-09-26 17:44:16.000000000 +0200 | ||
1341 | +++ php-5.3.3-magellan/win32/syslog.reg 1970-01-01 01:00:00.000000000 +0100 | ||
1342 | @@ -1,5 +0,0 @@ | ||
1343 | -REGEDIT4 | ||
1344 | - | ||
1345 | -[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Eventlog\Application\PHP-5.1.0-dev] | ||
1346 | -"TypesSupported"=dword:00000007 | ||
1347 | -"EventMessageFile"="C:\\php5\\php5ts.dll" | ||
1348 | diff -Naur php-5.3.3/Zend/Makefile.am php-5.3.3-magellan/Zend/Makefile.am | ||
1349 | --- php-5.3.3/Zend/Makefile.am 2009-03-18 11:18:10.000000000 +0100 | ||
1350 | +++ php-5.3.3-magellan/Zend/Makefile.am 2010-07-26 12:11:25.000000000 +0200 | ||
1351 | @@ -17,7 +17,7 @@ | ||
1352 | zend_objects_API.c zend_ts_hash.c zend_stream.c \ | ||
1353 | zend_default_classes.c \ | ||
1354 | zend_iterators.c zend_interfaces.c zend_exceptions.c \ | ||
1355 | - zend_strtod.c zend_closures.c zend_float.c | ||
1356 | + zend_strtod.c zend_closures.c zend_float.c zend_canary.c zend_alloc_canary.c | ||
1357 | |||
1358 | libZend_la_LDFLAGS = | ||
1359 | libZend_la_LIBADD = @ZEND_EXTRA_LIBS@ | ||
1360 | diff -Naur php-5.3.3/Zend/zend_alloc.c php-5.3.3-magellan/Zend/zend_alloc.c | ||
1361 | --- php-5.3.3/Zend/zend_alloc.c 2010-07-14 12:27:08.000000000 +0200 | ||
1362 | +++ php-5.3.3-magellan/Zend/zend_alloc.c 2010-07-26 12:11:25.000000000 +0200 | ||
1363 | @@ -32,6 +32,10 @@ | ||
1364 | # include <unistd.h> | ||
1365 | #endif | ||
1366 | |||
1367 | +#if SUHOSIN_PATCH | ||
1368 | +#include "suhosin_patch.h" | ||
1369 | +#endif | ||
1370 | + | ||
1371 | #ifdef ZEND_WIN32 | ||
1372 | # include <wincrypt.h> | ||
1373 | # include <process.h> | ||
1374 | @@ -59,6 +63,7 @@ | ||
1375 | # define PTR_FMT "0x%0.8lx" | ||
1376 | #endif | ||
1377 | |||
1378 | +#ifndef SUHOSIN_MM_CLONE_FILE | ||
1379 | #if ZEND_DEBUG | ||
1380 | void zend_debug_alloc_output(char *format, ...) | ||
1381 | { | ||
1382 | @@ -76,6 +81,7 @@ | ||
1383 | #endif | ||
1384 | } | ||
1385 | #endif | ||
1386 | +#endif | ||
1387 | |||
1388 | #if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) | ||
1389 | static void zend_mm_panic(const char *message) __attribute__ ((noreturn)); | ||
1390 | @@ -134,6 +140,8 @@ | ||
1391 | # endif | ||
1392 | #endif | ||
1393 | |||
1394 | +static zend_intptr_t SUHOSIN_POINTER_GUARD = 0; | ||
1395 | + | ||
1396 | static zend_mm_storage* zend_mm_mem_dummy_init(void *params) | ||
1397 | { | ||
1398 | return malloc(sizeof(zend_mm_storage)); | ||
1399 | @@ -328,13 +336,28 @@ | ||
1400 | #define MEM_BLOCK_GUARD 0x2A8FCC84 | ||
1401 | #define MEM_BLOCK_LEAK 0x6C5E8F2D | ||
1402 | |||
1403 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
1404 | +# define CANARY_SIZE sizeof(size_t) | ||
1405 | +#else | ||
1406 | +# define CANARY_SIZE 0 | ||
1407 | +#endif | ||
1408 | + | ||
1409 | /* mm block type */ | ||
1410 | typedef struct _zend_mm_block_info { | ||
1411 | #if ZEND_MM_COOKIES | ||
1412 | size_t _cookie; | ||
1413 | #endif | ||
1414 | - size_t _size; | ||
1415 | - size_t _prev; | ||
1416 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
1417 | + size_t canary_1; | ||
1418 | +#endif | ||
1419 | + size_t _size; | ||
1420 | + size_t _prev; | ||
1421 | +#if SUHOSIN_PATCH | ||
1422 | + size_t size; | ||
1423 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
1424 | + size_t canary_2; | ||
1425 | +#endif | ||
1426 | +#endif | ||
1427 | } zend_mm_block_info; | ||
1428 | |||
1429 | #if ZEND_DEBUG | ||
1430 | @@ -408,7 +431,7 @@ | ||
1431 | # define ZEND_MM_CACHE_STAT 0 | ||
1432 | #endif | ||
1433 | |||
1434 | -struct _zend_mm_heap { | ||
1435 | +typedef struct _zend_mm_heap { | ||
1436 | int use_zend_alloc; | ||
1437 | void *(*_malloc)(size_t); | ||
1438 | void (*_free)(void*); | ||
1439 | @@ -443,6 +466,9 @@ | ||
1440 | int miss; | ||
1441 | } cache_stat[ZEND_MM_NUM_BUCKETS+1]; | ||
1442 | #endif | ||
1443 | +#if SUHOSIN_PATCH | ||
1444 | + size_t canary_1,canary_2,canary_3; | ||
1445 | +#endif | ||
1446 | }; | ||
1447 | |||
1448 | #define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \ | ||
1449 | @@ -516,18 +542,31 @@ | ||
1450 | /* optimized access */ | ||
1451 | #define ZEND_MM_FREE_BLOCK_SIZE(b) (b)->info._size | ||
1452 | |||
1453 | +#ifndef ZEND_MM_ALIGNMENT | ||
1454 | +# define ZEND_MM_ALIGNMENT 8 | ||
1455 | +# define ZEND_MM_ALIGNMENT_LOG2 3 | ||
1456 | +#elif ZEND_MM_ALIGNMENT < 4 | ||
1457 | +# undef ZEND_MM_ALIGNMENT | ||
1458 | +# undef ZEND_MM_ALIGNMENT_LOG2 | ||
1459 | +# define ZEND_MM_ALIGNMENT 4 | ||
1460 | +# define ZEND_MM_ALIGNMENT_LOG2 2 | ||
1461 | +#endif | ||
1462 | + | ||
1463 | +#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1) | ||
1464 | + | ||
1465 | /* Aligned header size */ | ||
1466 | +#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK) | ||
1467 | #define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block)) | ||
1468 | #define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block)) | ||
1469 | -#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE) | ||
1470 | +#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE + CANARY_SIZE) | ||
1471 | #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) | ||
1472 | #define ZEND_MM_ALIGNED_SEGMENT_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_segment)) | ||
1473 | |||
1474 | -#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) | ||
1475 | +#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) | ||
1476 | |||
1477 | #define ZEND_MM_MAX_SMALL_SIZE ((ZEND_MM_NUM_BUCKETS<<ZEND_MM_ALIGNMENT_LOG2)+ZEND_MM_ALIGNED_MIN_HEADER_SIZE) | ||
1478 | |||
1479 | -#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))) | ||
1480 | +#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))) | ||
1481 | |||
1482 | #define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2)) | ||
1483 | |||
1484 | @@ -589,6 +628,44 @@ | ||
1485 | |||
1486 | #endif | ||
1487 | |||
1488 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
1489 | + | ||
1490 | +# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) do { \ | ||
1491 | + char *p = SUHOSIN_MM_END_CANARY_PTR(block); size_t check; \ | ||
1492 | + if (((block)->info.canary_1 != heap->canary_1) || ((block)->info.canary_2 != heap->canary_2)) { \ | ||
1493 | + canary_mismatch: \ | ||
1494 | + zend_suhosin_log(S_MEMORY, "canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \ | ||
1495 | + 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; }\ | ||
1496 | + } \ | ||
1497 | + memcpy(&check, p, CANARY_SIZE); \ | ||
1498 | + if (check != heap->canary_3) { \ | ||
1499 | + zend_suhosin_log(S_MEMORY, "end canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \ | ||
1500 | + if (SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) == 0) { _exit(1); } else { memcpy(p, heap->canary_3, CANARY_SIZE); } \ | ||
1501 | + } \ | ||
1502 | + } while (0) | ||
1503 | + | ||
1504 | +# define SUHOSIN_MM_SET_CANARIES(block) do { \ | ||
1505 | + (block)->info.canary_1 = heap->canary_1; \ | ||
1506 | + (block)->info.canary_2 = heap->canary_2; \ | ||
1507 | + } while (0) | ||
1508 | + | ||
1509 | +# define SUHOSIN_MM_END_CANARY_PTR(block) \ | ||
1510 | + (char *)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block*)(block))->info.size + END_MAGIC_SIZE) | ||
1511 | + | ||
1512 | +# define SUHOSIN_MM_SET_END_CANARY(block) do { \ | ||
1513 | + char *p = SUHOSIN_MM_END_CANARY_PTR(block); \ | ||
1514 | + memcpy(p, &heap->canary_3, CANARY_SIZE); \ | ||
1515 | + } while (0) | ||
1516 | + | ||
1517 | +#else | ||
1518 | + | ||
1519 | +# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) | ||
1520 | +# define SUHOSIN_MM_SET_CANARIES(block) | ||
1521 | +# define SUHOSIN_MM_END_CANARY_PTR(block) | ||
1522 | +# define SUHOSIN_MM_SET_END_CANARY(block) | ||
1523 | + | ||
1524 | +#endif | ||
1525 | + | ||
1526 | |||
1527 | #if ZEND_MM_HEAP_PROTECTION | ||
1528 | |||
1529 | @@ -711,7 +788,7 @@ | ||
1530 | #endif | ||
1531 | } | ||
1532 | |||
1533 | -static inline void zend_mm_add_to_rest_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) | ||
1534 | +static void zend_mm_add_to_rest_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) | ||
1535 | { | ||
1536 | zend_mm_free_block *prev, *next; | ||
1537 | |||
1538 | @@ -721,14 +798,14 @@ | ||
1539 | mm_block->parent = NULL; | ||
1540 | } | ||
1541 | |||
1542 | - prev = heap->rest_buckets[0]; | ||
1543 | - next = prev->next_free_block; | ||
1544 | - mm_block->prev_free_block = prev; | ||
1545 | - mm_block->next_free_block = next; | ||
1546 | - prev->next_free_block = next->prev_free_block = mm_block; | ||
1547 | + prev = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]); | ||
1548 | + next = SUHOSIN_MANGLE_PTR(prev->next_free_block); | ||
1549 | + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); | ||
1550 | + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); | ||
1551 | + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); | ||
1552 | } | ||
1553 | |||
1554 | -static inline void zend_mm_add_to_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) | ||
1555 | +static void zend_mm_add_to_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) | ||
1556 | { | ||
1557 | size_t size; | ||
1558 | size_t index; | ||
1559 | @@ -745,7 +822,7 @@ | ||
1560 | if (!*p) { | ||
1561 | *p = mm_block; | ||
1562 | mm_block->parent = p; | ||
1563 | - mm_block->prev_free_block = mm_block->next_free_block = mm_block; | ||
1564 | + mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block); | ||
1565 | heap->large_free_bitmap |= (ZEND_MM_LONG_CONST(1) << index); | ||
1566 | } else { | ||
1567 | size_t m; | ||
1568 | @@ -758,15 +835,15 @@ | ||
1569 | if (!*p) { | ||
1570 | *p = mm_block; | ||
1571 | mm_block->parent = p; | ||
1572 | - mm_block->prev_free_block = mm_block->next_free_block = mm_block; | ||
1573 | + mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block); | ||
1574 | break; | ||
1575 | } | ||
1576 | } else { | ||
1577 | - zend_mm_free_block *next = prev->next_free_block; | ||
1578 | + zend_mm_free_block *next = SUHOSIN_MANGLE_PTR(prev->next_free_block); | ||
1579 | |||
1580 | - prev->next_free_block = next->prev_free_block = mm_block; | ||
1581 | - mm_block->next_free_block = next; | ||
1582 | - mm_block->prev_free_block = prev; | ||
1583 | + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); | ||
1584 | + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); | ||
1585 | + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); | ||
1586 | mm_block->parent = NULL; | ||
1587 | break; | ||
1588 | } | ||
1589 | @@ -778,27 +855,33 @@ | ||
1590 | index = ZEND_MM_BUCKET_INDEX(size); | ||
1591 | |||
1592 | prev = ZEND_MM_SMALL_FREE_BUCKET(heap, index); | ||
1593 | - if (prev->prev_free_block == prev) { | ||
1594 | + if (SUHOSIN_MANGLE_PTR(prev->prev_free_block) == prev) { | ||
1595 | heap->free_bitmap |= (ZEND_MM_LONG_CONST(1) << index); | ||
1596 | } | ||
1597 | - next = prev->next_free_block; | ||
1598 | + next = SUHOSIN_MANGLE_PTR(prev->next_free_block); | ||
1599 | |||
1600 | - mm_block->prev_free_block = prev; | ||
1601 | - mm_block->next_free_block = next; | ||
1602 | - prev->next_free_block = next->prev_free_block = mm_block; | ||
1603 | + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); | ||
1604 | + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); | ||
1605 | + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); | ||
1606 | } | ||
1607 | } | ||
1608 | |||
1609 | -static inline void zend_mm_remove_from_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) | ||
1610 | +static void zend_mm_remove_from_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block) | ||
1611 | { | ||
1612 | - zend_mm_free_block *prev = mm_block->prev_free_block; | ||
1613 | - zend_mm_free_block *next = mm_block->next_free_block; | ||
1614 | + zend_mm_free_block *prev = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block); | ||
1615 | + zend_mm_free_block *next = SUHOSIN_MANGLE_PTR(mm_block->next_free_block); | ||
1616 | |||
1617 | ZEND_MM_CHECK_MAGIC(mm_block, MEM_BLOCK_FREED); | ||
1618 | |||
1619 | if (EXPECTED(prev == mm_block)) { | ||
1620 | zend_mm_free_block **rp, **cp; | ||
1621 | |||
1622 | +#if SUHOSIN_PATCH | ||
1623 | + if (next != mm_block) { | ||
1624 | + zend_suhosin_log(S_MEMORY, "zend_mm_heap corrupted at %p", mm_block); | ||
1625 | + _exit(1); | ||
1626 | + } | ||
1627 | +#endif | ||
1628 | #if ZEND_MM_SAFE_UNLINKING | ||
1629 | if (UNEXPECTED(next != mm_block)) { | ||
1630 | zend_mm_panic("zend_mm_heap corrupted"); | ||
1631 | @@ -837,14 +920,21 @@ | ||
1632 | } | ||
1633 | } else { | ||
1634 | |||
1635 | +#if SUHOSIN_PATCH | ||
1636 | + if (SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block || SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block) { | ||
1637 | + zend_suhosin_log(S_MEMORY, "zend_mm_head corrupted at %p", mm_block); | ||
1638 | + _exit(1); | ||
1639 | + } | ||
1640 | +#endif | ||
1641 | + | ||
1642 | #if ZEND_MM_SAFE_UNLINKING | ||
1643 | - if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) { | ||
1644 | + if (UNEXPECTED(SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block) || UNEXPECTED(SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block)) { | ||
1645 | zend_mm_panic("zend_mm_heap corrupted"); | ||
1646 | } | ||
1647 | #endif | ||
1648 | |||
1649 | - prev->next_free_block = next; | ||
1650 | - next->prev_free_block = prev; | ||
1651 | + prev->next_free_block = SUHOSIN_MANGLE_PTR(next); | ||
1652 | + next->prev_free_block = SUHOSIN_MANGLE_PTR(prev); | ||
1653 | |||
1654 | if (EXPECTED(ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block)))) { | ||
1655 | if (EXPECTED(prev == next)) { | ||
1656 | @@ -860,7 +950,7 @@ | ||
1657 | } | ||
1658 | } | ||
1659 | |||
1660 | -static inline void zend_mm_init(zend_mm_heap *heap) | ||
1661 | +static void zend_mm_init(zend_mm_heap *heap) | ||
1662 | { | ||
1663 | zend_mm_free_block* p; | ||
1664 | int i; | ||
1665 | @@ -878,12 +968,19 @@ | ||
1666 | #endif | ||
1667 | p = ZEND_MM_SMALL_FREE_BUCKET(heap, 0); | ||
1668 | for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { | ||
1669 | - p->next_free_block = p; | ||
1670 | - p->prev_free_block = p; | ||
1671 | + p->next_free_block = SUHOSIN_MANGLE_PTR(p); | ||
1672 | + p->prev_free_block = SUHOSIN_MANGLE_PTR(p); | ||
1673 | p = (zend_mm_free_block*)((char*)p + sizeof(zend_mm_free_block*) * 2); | ||
1674 | heap->large_free_buckets[i] = NULL; | ||
1675 | } | ||
1676 | - heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap); | ||
1677 | + heap->rest_buckets[0] = heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(heap)); | ||
1678 | +#if SUHOSIN_PATCH | ||
1679 | + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) { | ||
1680 | + zend_canary(&heap->canary_1, sizeof(heap->canary_1)); | ||
1681 | + zend_canary(&heap->canary_2, sizeof(heap->canary_2)); | ||
1682 | + zend_canary(&heap->canary_3, sizeof(heap->canary_3)); | ||
1683 | + } | ||
1684 | +#endif | ||
1685 | } | ||
1686 | |||
1687 | static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment) | ||
1688 | @@ -904,12 +1001,13 @@ | ||
1689 | int i; | ||
1690 | |||
1691 | for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { | ||
1692 | + /* NULL means NULL even MANGLED */ | ||
1693 | if (heap->cache[i]) { | ||
1694 | - zend_mm_free_block *mm_block = heap->cache[i]; | ||
1695 | + zend_mm_free_block *mm_block = SUHOSIN_MANGLE_PTR(heap->cache[i]); | ||
1696 | |||
1697 | while (mm_block) { | ||
1698 | size_t size = ZEND_MM_BLOCK_SIZE(mm_block); | ||
1699 | - zend_mm_free_block *q = mm_block->prev_free_block; | ||
1700 | + zend_mm_free_block *q = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block); | ||
1701 | zend_mm_block *next_block = ZEND_MM_NEXT_BLOCK(mm_block); | ||
1702 | |||
1703 | heap->cached -= size; | ||
1704 | @@ -1005,14 +1103,20 @@ | ||
1705 | /* }}} */ | ||
1706 | #endif | ||
1707 | |||
1708 | + | ||
1709 | /* Notes: | ||
1710 | * - This function may alter the block_sizes values to match platform alignment | ||
1711 | * - This function does *not* perform sanity checks on the arguments | ||
1712 | */ | ||
1713 | -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) | ||
1714 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
1715 | +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) | ||
1716 | +#else | ||
1717 | +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) | ||
1718 | +#endif | ||
1719 | { | ||
1720 | zend_mm_storage *storage; | ||
1721 | zend_mm_heap *heap; | ||
1722 | + zend_mm_free_block *tmp; | ||
1723 | |||
1724 | #if 0 | ||
1725 | int i; | ||
1726 | @@ -1046,6 +1150,12 @@ | ||
1727 | } | ||
1728 | #endif | ||
1729 | |||
1730 | + /* get the pointer guardian and ensure low 3 bits are 1 */ | ||
1731 | + if (SUHOSIN_POINTER_GUARD == 0) { | ||
1732 | + zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD)); | ||
1733 | + SUHOSIN_POINTER_GUARD |= 7; | ||
1734 | + } | ||
1735 | + | ||
1736 | if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) { | ||
1737 | fprintf(stderr, "'block_size' must be a power of two\n"); | ||
1738 | /* See http://support.microsoft.com/kb/190351 */ | ||
1739 | @@ -1087,12 +1197,12 @@ | ||
1740 | heap->reserve = NULL; | ||
1741 | heap->reserve_size = reserve_size; | ||
1742 | if (reserve_size > 0) { | ||
1743 | - heap->reserve = _zend_mm_alloc_int(heap, reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
1744 | + heap->reserve = _zend_mm_alloc(heap, reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
1745 | } | ||
1746 | if (internal) { | ||
1747 | int i; | ||
1748 | zend_mm_free_block *p, *q, *orig; | ||
1749 | - zend_mm_heap *mm_heap = _zend_mm_alloc_int(heap, sizeof(zend_mm_heap) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
1750 | + zend_mm_heap *mm_heap = _zend_mm_alloc(heap, sizeof(zend_mm_heap) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
1751 | |||
1752 | *mm_heap = *heap; | ||
1753 | |||
1754 | @@ -1100,22 +1210,22 @@ | ||
1755 | orig = ZEND_MM_SMALL_FREE_BUCKET(heap, 0); | ||
1756 | for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { | ||
1757 | q = p; | ||
1758 | - while (q->prev_free_block != orig) { | ||
1759 | - q = q->prev_free_block; | ||
1760 | + while (SUHOSIN_MANGLE_PTR(q->prev_free_block) != orig) { | ||
1761 | + q = SUHOSIN_MANGLE_PTR(q->prev_free_block); | ||
1762 | } | ||
1763 | - q->prev_free_block = p; | ||
1764 | + q->prev_free_block = SUHOSIN_MANGLE_PTR(p); | ||
1765 | q = p; | ||
1766 | - while (q->next_free_block != orig) { | ||
1767 | - q = q->next_free_block; | ||
1768 | + while (SUHOSIN_MANGLE_PTR(q->next_free_block) != orig) { | ||
1769 | + q = SUHOSIN_MANGLE_PTR(q->next_free_block); | ||
1770 | } | ||
1771 | - q->next_free_block = p; | ||
1772 | + q->next_free_block = SUHOSIN_MANGLE_PTR(p); | ||
1773 | p = (zend_mm_free_block*)((char*)p + sizeof(zend_mm_free_block*) * 2); | ||
1774 | orig = (zend_mm_free_block*)((char*)orig + sizeof(zend_mm_free_block*) * 2); | ||
1775 | if (mm_heap->large_free_buckets[i]) { | ||
1776 | mm_heap->large_free_buckets[i]->parent = &mm_heap->large_free_buckets[i]; | ||
1777 | } | ||
1778 | } | ||
1779 | - mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(mm_heap); | ||
1780 | + mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(mm_heap)); | ||
1781 | |||
1782 | free(heap); | ||
1783 | heap = mm_heap; | ||
1784 | @@ -1123,7 +1233,11 @@ | ||
1785 | return heap; | ||
1786 | } | ||
1787 | |||
1788 | -ZEND_API zend_mm_heap *zend_mm_startup(void) | ||
1789 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
1790 | +zend_mm_heap *__zend_mm_startup_canary(void) | ||
1791 | +#else | ||
1792 | +static zend_mm_heap *__zend_mm_startup(void) | ||
1793 | +#endif | ||
1794 | { | ||
1795 | int i; | ||
1796 | size_t seg_size; | ||
1797 | @@ -1193,6 +1307,27 @@ | ||
1798 | return heap; | ||
1799 | } | ||
1800 | |||
1801 | +#ifndef SUHOSIN_MM_CLONE_FILE | ||
1802 | +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); | ||
1803 | +zend_mm_heap_canary *__zend_mm_startup_canary(void); | ||
1804 | + | ||
1805 | +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) | ||
1806 | +{ | ||
1807 | + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) { | ||
1808 | + return (zend_mm_heap *)__zend_mm_startup_canary_ex(handlers, block_size, reserve_size, internal, params); | ||
1809 | + } | ||
1810 | + return __zend_mm_startup_ex(handlers, block_size, reserve_size, internal, params); | ||
1811 | +} | ||
1812 | +ZEND_API zend_mm_heap *zend_mm_startup(void) | ||
1813 | +{ | ||
1814 | + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) { | ||
1815 | + return (zend_mm_heap *)__zend_mm_startup_canary(); | ||
1816 | + } | ||
1817 | + return __zend_mm_startup(); | ||
1818 | +} | ||
1819 | + | ||
1820 | +#endif | ||
1821 | + | ||
1822 | #if ZEND_DEBUG | ||
1823 | static long zend_mm_find_leaks(zend_mm_segment *segment, zend_mm_block *b) | ||
1824 | { | ||
1825 | @@ -1561,7 +1696,11 @@ | ||
1826 | } | ||
1827 | #endif | ||
1828 | |||
1829 | -ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC) | ||
1830 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
1831 | +void __zend_mm_shutdown_canary(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC) | ||
1832 | +#else | ||
1833 | +static void __zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC) | ||
1834 | +#endif | ||
1835 | { | ||
1836 | zend_mm_storage *storage; | ||
1837 | zend_mm_segment *segment; | ||
1838 | @@ -1571,7 +1710,7 @@ | ||
1839 | if (heap->reserve) { | ||
1840 | #if ZEND_DEBUG | ||
1841 | if (!silent) { | ||
1842 | - _zend_mm_free_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
1843 | + _zend_mm_free(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
1844 | } | ||
1845 | #endif | ||
1846 | heap->reserve = NULL; | ||
1847 | @@ -1654,12 +1793,23 @@ | ||
1848 | heap->size = 0; | ||
1849 | heap->peak = 0; | ||
1850 | if (heap->reserve_size) { | ||
1851 | - heap->reserve = _zend_mm_alloc_int(heap, heap->reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
1852 | + heap->reserve = _zend_mm_alloc(heap, heap->reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
1853 | } | ||
1854 | heap->overflow = 0; | ||
1855 | } | ||
1856 | } | ||
1857 | |||
1858 | +#ifndef SUHOSIN_MM_CLONE_FILE | ||
1859 | +ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC) | ||
1860 | +{ | ||
1861 | + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) { | ||
1862 | + __zend_mm_shutdown_canary(heap, full_shutdown, silent TSRMLS_CC); | ||
1863 | + return; | ||
1864 | + } | ||
1865 | + __zend_mm_shutdown(heap, full_shutdown, silent TSRMLS_CC); | ||
1866 | +} | ||
1867 | +#endif | ||
1868 | + | ||
1869 | static void zend_mm_safe_error(zend_mm_heap *heap, | ||
1870 | const char *format, | ||
1871 | size_t limit, | ||
1872 | @@ -1670,7 +1820,11 @@ | ||
1873 | size_t size) | ||
1874 | { | ||
1875 | if (heap->reserve) { | ||
1876 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
1877 | + _zend_mm_free_canary_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
1878 | +#else | ||
1879 | _zend_mm_free_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
1880 | +#endif | ||
1881 | heap->reserve = NULL; | ||
1882 | } | ||
1883 | if (heap->overflow == 0) { | ||
1884 | @@ -1745,7 +1899,7 @@ | ||
1885 | p = heap->large_free_buckets[index]; | ||
1886 | for (m = true_size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) { | ||
1887 | if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) { | ||
1888 | - return p->next_free_block; | ||
1889 | + return SUHOSIN_MANGLE_PTR(p->next_free_block); | ||
1890 | } else if (ZEND_MM_FREE_BLOCK_SIZE(p) >= true_size && | ||
1891 | ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) { | ||
1892 | best_size = ZEND_MM_FREE_BLOCK_SIZE(p); | ||
1893 | @@ -1769,7 +1923,7 @@ | ||
1894 | |||
1895 | for (p = rst; p; p = p->child[p->child[0] != NULL]) { | ||
1896 | if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) { | ||
1897 | - return p->next_free_block; | ||
1898 | + return SUHOSIN_MANGLE_PTR(p->next_free_block); | ||
1899 | } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size && | ||
1900 | ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) { | ||
1901 | best_size = ZEND_MM_FREE_BLOCK_SIZE(p); | ||
1902 | @@ -1778,7 +1932,7 @@ | ||
1903 | } | ||
1904 | |||
1905 | if (best_fit) { | ||
1906 | - return best_fit->next_free_block; | ||
1907 | + return SUHOSIN_MANGLE_PTR(best_fit->next_free_block); | ||
1908 | } | ||
1909 | bitmap = bitmap >> 1; | ||
1910 | if (!bitmap) { | ||
1911 | @@ -1794,9 +1948,12 @@ | ||
1912 | best_fit = p; | ||
1913 | } | ||
1914 | } | ||
1915 | - return best_fit->next_free_block; | ||
1916 | + return SUHOSIN_MANGLE_PTR(best_fit->next_free_block); | ||
1917 | } | ||
1918 | |||
1919 | +#if SUHOSIN_PATCH | ||
1920 | +void *_zend_mm_alloc_canary_int(zend_mm_heap_canary *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); | ||
1921 | +#endif | ||
1922 | static void *_zend_mm_alloc_int(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
1923 | { | ||
1924 | zend_mm_free_block *best_fit; | ||
1925 | @@ -1806,7 +1963,7 @@ | ||
1926 | size_t segment_size; | ||
1927 | zend_mm_segment *segment; | ||
1928 | int keep_rest = 0; | ||
1929 | - | ||
1930 | + | ||
1931 | if (EXPECTED(ZEND_MM_SMALL_SIZE(true_size))) { | ||
1932 | size_t index = ZEND_MM_BUCKET_INDEX(true_size); | ||
1933 | size_t bitmap; | ||
1934 | @@ -1821,9 +1978,14 @@ | ||
1935 | heap->cache_stat[index].count--; | ||
1936 | heap->cache_stat[index].hit++; | ||
1937 | #endif | ||
1938 | - best_fit = heap->cache[index]; | ||
1939 | + best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]); | ||
1940 | heap->cache[index] = best_fit->prev_free_block; | ||
1941 | heap->cached -= true_size; | ||
1942 | +#if SUHOSIN_PATCH | ||
1943 | + SUHOSIN_MM_SET_CANARIES(best_fit); | ||
1944 | + ((zend_mm_block*)best_fit)->info.size = size; | ||
1945 | + SUHOSIN_MM_SET_END_CANARY(best_fit); | ||
1946 | +#endif | ||
1947 | ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED); | ||
1948 | ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0); | ||
1949 | return ZEND_MM_DATA_OF(best_fit); | ||
1950 | @@ -1837,7 +1999,7 @@ | ||
1951 | if (bitmap) { | ||
1952 | /* Found some "small" free block that can be used */ | ||
1953 | index += zend_mm_low_bit(bitmap); | ||
1954 | - best_fit = heap->free_buckets[index*2]; | ||
1955 | + best_fit = SUHOSIN_MANGLE_PTR(heap->free_buckets[index*2]); | ||
1956 | #if ZEND_MM_CACHE_STAT | ||
1957 | heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit++; | ||
1958 | #endif | ||
1959 | @@ -1852,7 +2014,7 @@ | ||
1960 | best_fit = zend_mm_search_large_block(heap, true_size); | ||
1961 | |||
1962 | if (!best_fit && heap->real_size >= heap->limit - heap->block_size) { | ||
1963 | - zend_mm_free_block *p = heap->rest_buckets[0]; | ||
1964 | + zend_mm_free_block *p = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]); | ||
1965 | size_t best_size = -1; | ||
1966 | |||
1967 | while (p != ZEND_MM_REST_BUCKET(heap)) { | ||
1968 | @@ -1864,7 +2026,7 @@ | ||
1969 | best_size = ZEND_MM_FREE_BLOCK_SIZE(p); | ||
1970 | best_fit = p; | ||
1971 | } | ||
1972 | - p = p->prev_free_block; | ||
1973 | + p = SUHOSIN_MANGLE_PTR(p->prev_free_block); | ||
1974 | } | ||
1975 | } | ||
1976 | |||
1977 | @@ -1963,13 +2125,19 @@ | ||
1978 | |||
1979 | ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1); | ||
1980 | |||
1981 | +#if SUHOSIN_PATCH | ||
1982 | + SUHOSIN_MM_SET_CANARIES(best_fit); | ||
1983 | + ((zend_mm_block*)best_fit)->info.size = size; | ||
1984 | + SUHOSIN_MM_SET_END_CANARY(best_fit); | ||
1985 | +#endif | ||
1986 | + | ||
1987 | heap->size += true_size; | ||
1988 | if (heap->peak < heap->size) { | ||
1989 | heap->peak = heap->size; | ||
1990 | } | ||
1991 | |||
1992 | HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
1993 | - | ||
1994 | + | ||
1995 | return ZEND_MM_DATA_OF(best_fit); | ||
1996 | } | ||
1997 | |||
1998 | @@ -1986,19 +2154,26 @@ | ||
1999 | |||
2000 | mm_block = ZEND_MM_HEADER_OF(p); | ||
2001 | size = ZEND_MM_BLOCK_SIZE(mm_block); | ||
2002 | +#if SUHOSIN_PATCH | ||
2003 | + SUHOSIN_MM_CHECK_CANARIES(mm_block, "efree()"); | ||
2004 | +#endif | ||
2005 | ZEND_MM_CHECK_PROTECTION(mm_block); | ||
2006 | |||
2007 | #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION | ||
2008 | memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->debug.size); | ||
2009 | #endif | ||
2010 | - | ||
2011 | +#if SUHOSIN_PATCH | ||
2012 | + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_DESTROY_FREE_MEMORY))) { | ||
2013 | + memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->info.size); | ||
2014 | + } | ||
2015 | +#endif | ||
2016 | #if ZEND_MM_CACHE | ||
2017 | if (EXPECTED(ZEND_MM_SMALL_SIZE(size)) && EXPECTED(heap->cached < ZEND_MM_CACHE_SIZE)) { | ||
2018 | size_t index = ZEND_MM_BUCKET_INDEX(size); | ||
2019 | zend_mm_free_block **cache = &heap->cache[index]; | ||
2020 | |||
2021 | ((zend_mm_free_block*)mm_block)->prev_free_block = *cache; | ||
2022 | - *cache = (zend_mm_free_block*)mm_block; | ||
2023 | + *cache = (zend_mm_free_block*)SUHOSIN_MANGLE_PTR(mm_block); | ||
2024 | heap->cached += size; | ||
2025 | ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED); | ||
2026 | #if ZEND_MM_CACHE_STAT | ||
2027 | @@ -2034,6 +2209,9 @@ | ||
2028 | HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
2029 | } | ||
2030 | |||
2031 | +#if SUHOSIN_PATCH | ||
2032 | +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); | ||
2033 | +#endif | ||
2034 | static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
2035 | { | ||
2036 | zend_mm_block *mm_block = ZEND_MM_HEADER_OF(p); | ||
2037 | @@ -2043,11 +2221,18 @@ | ||
2038 | void *ptr; | ||
2039 | |||
2040 | if (UNEXPECTED(!p) || !ZEND_MM_VALID_PTR(p)) { | ||
2041 | +#ifdef SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
2042 | + return _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2043 | +#else | ||
2044 | return _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2045 | +#endif | ||
2046 | } | ||
2047 | mm_block = ZEND_MM_HEADER_OF(p); | ||
2048 | true_size = ZEND_MM_TRUE_SIZE(size); | ||
2049 | orig_size = ZEND_MM_BLOCK_SIZE(mm_block); | ||
2050 | +#if SUHOSIN_PATCH | ||
2051 | + SUHOSIN_MM_CHECK_CANARIES(mm_block, "erealloc()"); | ||
2052 | +#endif | ||
2053 | ZEND_MM_CHECK_PROTECTION(mm_block); | ||
2054 | |||
2055 | if (UNEXPECTED(true_size < size)) { | ||
2056 | @@ -2079,6 +2264,11 @@ | ||
2057 | HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
2058 | } | ||
2059 | ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0); | ||
2060 | +#if SUHOSIN_PATCH | ||
2061 | + SUHOSIN_MM_SET_CANARIES(mm_block); | ||
2062 | + ((zend_mm_block*)mm_block)->info.size = size; | ||
2063 | + SUHOSIN_MM_SET_END_CANARY(mm_block); | ||
2064 | +#endif | ||
2065 | return p; | ||
2066 | } | ||
2067 | |||
2068 | @@ -2094,17 +2284,22 @@ | ||
2069 | heap->cache_stat[index].count--; | ||
2070 | heap->cache_stat[index].hit++; | ||
2071 | #endif | ||
2072 | - best_fit = heap->cache[index]; | ||
2073 | + best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]); | ||
2074 | heap->cache[index] = best_fit->prev_free_block; | ||
2075 | ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED); | ||
2076 | - ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0); | ||
2077 | - | ||
2078 | + ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0); | ||
2079 | +#if SUHOSIN_PATCH | ||
2080 | + SUHOSIN_MM_SET_CANARIES(best_fit); | ||
2081 | + ((zend_mm_block*)best_fit)->info.size = size; | ||
2082 | + SUHOSIN_MM_SET_END_CANARY(best_fit); | ||
2083 | +#endif | ||
2084 | + | ||
2085 | ptr = ZEND_MM_DATA_OF(best_fit); | ||
2086 | |||
2087 | #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION | ||
2088 | memcpy(ptr, p, mm_block->debug.size); | ||
2089 | #else | ||
2090 | - memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE); | ||
2091 | + memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE); | ||
2092 | #endif | ||
2093 | |||
2094 | heap->cached -= true_size - orig_size; | ||
2095 | @@ -2113,14 +2308,13 @@ | ||
2096 | cache = &heap->cache[index]; | ||
2097 | |||
2098 | ((zend_mm_free_block*)mm_block)->prev_free_block = *cache; | ||
2099 | - *cache = (zend_mm_free_block*)mm_block; | ||
2100 | + *cache = (zend_mm_free_block*)SUHOSIN_MANGLE_PTR(mm_block); | ||
2101 | ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED); | ||
2102 | #if ZEND_MM_CACHE_STAT | ||
2103 | if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) { | ||
2104 | heap->cache_stat[index].max_count = heap->cache_stat[index].count; | ||
2105 | } | ||
2106 | #endif | ||
2107 | - | ||
2108 | return ptr; | ||
2109 | } | ||
2110 | } | ||
2111 | @@ -2163,6 +2357,11 @@ | ||
2112 | heap->peak = heap->size; | ||
2113 | } | ||
2114 | HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
2115 | +#if SUHOSIN_PATCH | ||
2116 | + SUHOSIN_MM_SET_CANARIES(mm_block); | ||
2117 | + ((zend_mm_block*)mm_block)->info.size = size; | ||
2118 | + SUHOSIN_MM_SET_END_CANARY(mm_block); | ||
2119 | +#endif | ||
2120 | return p; | ||
2121 | } else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && | ||
2122 | ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(next_block, ZEND_MM_FREE_BLOCK_SIZE(next_block)))) { | ||
2123 | @@ -2265,38 +2464,90 @@ | ||
2124 | } | ||
2125 | |||
2126 | HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
2127 | +#if SUHOSIN_PATCH | ||
2128 | + SUHOSIN_MM_SET_CANARIES(mm_block); | ||
2129 | + ((zend_mm_block*)mm_block)->info.size = size; | ||
2130 | + SUHOSIN_MM_SET_END_CANARY(mm_block); | ||
2131 | +#endif | ||
2132 | return ZEND_MM_DATA_OF(mm_block); | ||
2133 | } | ||
2134 | |||
2135 | +#ifdef SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
2136 | + ptr = _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2137 | +#else | ||
2138 | ptr = _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2139 | +#endif | ||
2140 | #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION | ||
2141 | memcpy(ptr, p, mm_block->debug.size); | ||
2142 | #else | ||
2143 | - memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE); | ||
2144 | + memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE); | ||
2145 | #endif | ||
2146 | +#ifdef SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
2147 | + _zend_mm_free_canary_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2148 | +#else | ||
2149 | _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2150 | +#endif | ||
2151 | return ptr; | ||
2152 | } | ||
2153 | |||
2154 | +#ifndef SUHOSIN_MM_CLONE_FILE | ||
2155 | ZEND_API void *_zend_mm_alloc(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
2156 | { | ||
2157 | - return _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2158 | +#if SUHOSIN_PATCH | ||
2159 | + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) | ||
2160 | +#endif | ||
2161 | + return _zend_mm_alloc_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2162 | +#if SUHOSIN_PATCH | ||
2163 | + return _zend_mm_alloc_canary_int((zend_mm_heap_canary *)heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2164 | +#endif | ||
2165 | } | ||
2166 | |||
2167 | ZEND_API void _zend_mm_free(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
2168 | { | ||
2169 | - _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2170 | +#if SUHOSIN_PATCH | ||
2171 | + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) | ||
2172 | +#endif | ||
2173 | + { _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); return; } | ||
2174 | +#if SUHOSIN_PATCH | ||
2175 | + _zend_mm_free_canary_int((zend_mm_heap_canary *)heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2176 | +#endif | ||
2177 | } | ||
2178 | |||
2179 | ZEND_API void *_zend_mm_realloc(zend_mm_heap *heap, void *ptr, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
2180 | { | ||
2181 | - return _zend_mm_realloc_int(heap, ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2182 | +#if SUHOSIN_PATCH | ||
2183 | + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) | ||
2184 | +#endif | ||
2185 | + return _zend_mm_realloc_int(heap, ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2186 | +#if SUHOSIN_PATCH | ||
2187 | + return _zend_mm_realloc_canary_int((zend_mm_heap_canary *)heap, ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2188 | +#endif | ||
2189 | } | ||
2190 | |||
2191 | ZEND_API size_t _zend_mm_block_size(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
2192 | { | ||
2193 | zend_mm_block *mm_block; | ||
2194 | |||
2195 | + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) != 0) { | ||
2196 | + return _zend_mm_block_size_canary((zend_mm_heap_canary *)heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2197 | + } | ||
2198 | + | ||
2199 | + if (!ZEND_MM_VALID_PTR(p)) { | ||
2200 | + return 0; | ||
2201 | + } | ||
2202 | + mm_block = ZEND_MM_HEADER_OF(p); | ||
2203 | + ZEND_MM_CHECK_PROTECTION(mm_block); | ||
2204 | +#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION | ||
2205 | + return mm_block->debug.size; | ||
2206 | +#else | ||
2207 | + return ZEND_MM_BLOCK_SIZE(mm_block); | ||
2208 | +#endif | ||
2209 | +} | ||
2210 | +#else | ||
2211 | +ZEND_API size_t _zend_mm_block_size_canary(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
2212 | +{ | ||
2213 | + zend_mm_block *mm_block; | ||
2214 | + | ||
2215 | if (!ZEND_MM_VALID_PTR(p)) { | ||
2216 | return 0; | ||
2217 | } | ||
2218 | @@ -2309,6 +2560,8 @@ | ||
2219 | #endif | ||
2220 | } | ||
2221 | |||
2222 | +#endif | ||
2223 | + | ||
2224 | /**********************/ | ||
2225 | /* Allocation Manager */ | ||
2226 | /**********************/ | ||
2227 | @@ -2325,6 +2578,7 @@ | ||
2228 | static zend_alloc_globals alloc_globals; | ||
2229 | #endif | ||
2230 | |||
2231 | +#ifndef SUHOSIN_MM_CLONE_FILE | ||
2232 | ZEND_API int is_zend_mm(TSRMLS_D) | ||
2233 | { | ||
2234 | return AG(mm_heap)->use_zend_alloc; | ||
2235 | @@ -2337,7 +2591,13 @@ | ||
2236 | if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) { | ||
2237 | return AG(mm_heap)->_malloc(size); | ||
2238 | } | ||
2239 | +#if SUHOSIN_PATCH | ||
2240 | + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) | ||
2241 | +#endif | ||
2242 | return _zend_mm_alloc_int(AG(mm_heap), size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2243 | +#if SUHOSIN_PATCH | ||
2244 | + 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); | ||
2245 | +#endif | ||
2246 | } | ||
2247 | |||
2248 | ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
2249 | @@ -2348,7 +2608,13 @@ | ||
2250 | AG(mm_heap)->_free(ptr); | ||
2251 | return; | ||
2252 | } | ||
2253 | - _zend_mm_free_int(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2254 | +#if SUHOSIN_PATCH | ||
2255 | + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) | ||
2256 | +#endif | ||
2257 | + { _zend_mm_free_int(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); return; } | ||
2258 | +#if SUHOSIN_PATCH | ||
2259 | + _zend_mm_free_canary_int((zend_mm_heap_canary *)AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2260 | +#endif | ||
2261 | } | ||
2262 | |||
2263 | ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
2264 | @@ -2358,7 +2624,13 @@ | ||
2265 | if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) { | ||
2266 | return AG(mm_heap)->_realloc(ptr, size); | ||
2267 | } | ||
2268 | +#if SUHOSIN_PATCH | ||
2269 | + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) | ||
2270 | +#endif | ||
2271 | return _zend_mm_realloc_int(AG(mm_heap), ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2272 | +#if SUHOSIN_PATCH | ||
2273 | + 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); | ||
2274 | +#endif | ||
2275 | } | ||
2276 | |||
2277 | ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
2278 | @@ -2366,8 +2638,15 @@ | ||
2279 | if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) { | ||
2280 | return 0; | ||
2281 | } | ||
2282 | - return _zend_mm_block_size(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2283 | +#if SUHOSIN_PATCH | ||
2284 | + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) == 0)) | ||
2285 | +#endif | ||
2286 | + return _zend_mm_block_size(AG(mm_heap), ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
2287 | +#if SUHOSIN_PATCH | ||
2288 | + 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); | ||
2289 | +#endif | ||
2290 | } | ||
2291 | +#endif | ||
2292 | |||
2293 | #if defined(__GNUC__) && defined(i386) | ||
2294 | |||
2295 | @@ -2438,7 +2717,7 @@ | ||
2296 | } | ||
2297 | #endif | ||
2298 | |||
2299 | - | ||
2300 | +#ifndef SUHOSIN_MM_CLONE_FILE | ||
2301 | ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
2302 | { | ||
2303 | return emalloc_rel(safe_address(nmemb, size, offset)); | ||
2304 | @@ -2551,6 +2830,7 @@ | ||
2305 | { | ||
2306 | zend_mm_shutdown(AG(mm_heap), full_shutdown, silent TSRMLS_CC); | ||
2307 | } | ||
2308 | +#endif | ||
2309 | |||
2310 | static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC) | ||
2311 | { | ||
2312 | @@ -2575,6 +2855,7 @@ | ||
2313 | } | ||
2314 | #endif | ||
2315 | |||
2316 | +#ifndef SUHOSIN_MM_CLONE_FILE | ||
2317 | ZEND_API void start_memory_manager(TSRMLS_D) | ||
2318 | { | ||
2319 | #ifdef ZTS | ||
2320 | @@ -2639,6 +2920,7 @@ | ||
2321 | zend_debug_alloc_output("------------------------------------------------\n"); | ||
2322 | } | ||
2323 | #endif | ||
2324 | +#endif | ||
2325 | |||
2326 | /* | ||
2327 | * Local variables: | ||
2328 | diff -Naur php-5.3.3/Zend/zend_alloc_canary.c php-5.3.3-magellan/Zend/zend_alloc_canary.c | ||
2329 | --- php-5.3.3/Zend/zend_alloc_canary.c 1970-01-01 01:00:00.000000000 +0100 | ||
2330 | +++ php-5.3.3-magellan/Zend/zend_alloc_canary.c 2010-07-26 12:11:25.000000000 +0200 | ||
2331 | @@ -0,0 +1,2498 @@ | ||
2332 | +/* | ||
2333 | + +----------------------------------------------------------------------+ | ||
2334 | + | Suhosin-Patch for PHP | | ||
2335 | + +----------------------------------------------------------------------+ | ||
2336 | + | Copyright (c) 2004-2010 Stefan Esser | | ||
2337 | + +----------------------------------------------------------------------+ | ||
2338 | + | This source file is subject to version 2.02 of the PHP license, | | ||
2339 | + | that is bundled with this package in the file LICENSE, and is | | ||
2340 | + | available at through the world-wide-web at | | ||
2341 | + | http://www.php.net/license/2_02.txt. | | ||
2342 | + | If you did not receive a copy of the PHP license and are unable to | | ||
2343 | + | obtain it through the world-wide-web, please send a note to | | ||
2344 | + | license@php.net so we can mail you a copy immediately. | | ||
2345 | + +----------------------------------------------------------------------+ | ||
2346 | + | Author: Stefan Esser <stefan.esser@sektioneins.de> | | ||
2347 | + +----------------------------------------------------------------------+ | ||
2348 | + */ | ||
2349 | +/* $Id: php5-5.3.3-suhosin-0.9.10-2.patch,v 1.1 2010-08-22 18:31:04 niro Exp $ */ | ||
2350 | + | ||
2351 | +#include "zend.h" | ||
2352 | +#include "zend_alloc.h" | ||
2353 | +#include "zend_globals.h" | ||
2354 | +#include "zend_operators.h" | ||
2355 | + | ||
2356 | +#ifdef HAVE_SIGNAL_H | ||
2357 | +# include <signal.h> | ||
2358 | +#endif | ||
2359 | +#ifdef HAVE_UNISTD_H | ||
2360 | +# include <unistd.h> | ||
2361 | +#endif | ||
2362 | + | ||
2363 | +#if SUHOSIN_PATCH | ||
2364 | +#include "suhosin_patch.h" | ||
2365 | +#endif | ||
2366 | + | ||
2367 | +#ifdef ZEND_WIN32 | ||
2368 | +# include <wincrypt.h> | ||
2369 | +# include <process.h> | ||
2370 | +#endif | ||
2371 | + | ||
2372 | +#ifndef ZEND_MM_HEAP_PROTECTION | ||
2373 | +# define ZEND_MM_HEAP_PROTECTION ZEND_DEBUG | ||
2374 | +#endif | ||
2375 | + | ||
2376 | +#ifndef ZEND_MM_SAFE_UNLINKING | ||
2377 | +# define ZEND_MM_SAFE_UNLINKING 1 | ||
2378 | +#endif | ||
2379 | + | ||
2380 | +#ifndef ZEND_MM_COOKIES | ||
2381 | +# define ZEND_MM_COOKIES ZEND_DEBUG | ||
2382 | +#endif | ||
2383 | + | ||
2384 | +#ifdef _WIN64 | ||
2385 | +# define PTR_FMT "0x%0.16I64x" | ||
2386 | +/* | ||
2387 | +#elif sizeof(long) == 8 | ||
2388 | +# define PTR_FMT "0x%0.16lx" | ||
2389 | +*/ | ||
2390 | +#else | ||
2391 | +# define PTR_FMT "0x%0.8lx" | ||
2392 | +#endif | ||
2393 | + | ||
2394 | +#define SUHOSIN_MM_WITH_CANARY_PROTECTION 1 | ||
2395 | + | ||
2396 | +#if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX) | ||
2397 | +static void zend_mm_panic(const char *message) __attribute__ ((noreturn)); | ||
2398 | +#endif | ||
2399 | + | ||
2400 | +static void zend_mm_panic(const char *message) | ||
2401 | +{ | ||
2402 | + fprintf(stderr, "%s\n", message); | ||
2403 | +/* See http://support.microsoft.com/kb/190351 */ | ||
2404 | +#ifdef PHP_WIN32 | ||
2405 | + fflush(stderr); | ||
2406 | +#endif | ||
2407 | +#if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID) | ||
2408 | + kill(getpid(), SIGSEGV); | ||
2409 | +#endif | ||
2410 | + exit(1); | ||
2411 | +} | ||
2412 | + | ||
2413 | +/*******************/ | ||
2414 | +/* Storage Manager */ | ||
2415 | +/*******************/ | ||
2416 | + | ||
2417 | +#ifdef ZEND_WIN32 | ||
2418 | +# define HAVE_MEM_WIN32 /* use VirtualAlloc() to allocate memory */ | ||
2419 | +#endif | ||
2420 | +#define HAVE_MEM_MALLOC /* use malloc() to allocate segments */ | ||
2421 | + | ||
2422 | +#include <sys/types.h> | ||
2423 | +#include <sys/stat.h> | ||
2424 | +#if HAVE_LIMITS_H | ||
2425 | +#include <limits.h> | ||
2426 | +#endif | ||
2427 | +#include <fcntl.h> | ||
2428 | +#include <errno.h> | ||
2429 | + | ||
2430 | +#if defined(HAVE_MEM_MMAP_ANON) || defined(HAVE_MEM_MMAP_ZERO) | ||
2431 | +# ifdef HAVE_MREMAP | ||
2432 | +# ifndef _GNU_SOURCE | ||
2433 | +# define _GNU_SOURCE | ||
2434 | +# endif | ||
2435 | +# ifndef __USE_GNU | ||
2436 | +# define __USE_GNU | ||
2437 | +# endif | ||
2438 | +# endif | ||
2439 | +# include <sys/mman.h> | ||
2440 | +# ifndef MAP_ANON | ||
2441 | +# ifdef MAP_ANONYMOUS | ||
2442 | +# define MAP_ANON MAP_ANONYMOUS | ||
2443 | +# endif | ||
2444 | +# endif | ||
2445 | +# ifndef MREMAP_MAYMOVE | ||
2446 | +# define MREMAP_MAYMOVE 0 | ||
2447 | +# endif | ||
2448 | +# ifndef MAP_FAILED | ||
2449 | +# define MAP_FAILED ((void*)-1) | ||
2450 | +# endif | ||
2451 | +#endif | ||
2452 | + | ||
2453 | +static zend_intptr_t SUHOSIN_POINTER_GUARD = 0; | ||
2454 | + | ||
2455 | +static zend_mm_storage* zend_mm_mem_dummy_init(void *params) | ||
2456 | +{ | ||
2457 | + return malloc(sizeof(zend_mm_storage)); | ||
2458 | +} | ||
2459 | + | ||
2460 | +static void zend_mm_mem_dummy_dtor(zend_mm_storage *storage) | ||
2461 | +{ | ||
2462 | + free(storage); | ||
2463 | +} | ||
2464 | + | ||
2465 | +static void zend_mm_mem_dummy_compact(zend_mm_storage *storage) | ||
2466 | +{ | ||
2467 | +} | ||
2468 | + | ||
2469 | +#if defined(HAVE_MEM_MMAP_ANON) || defined(HAVE_MEM_MMAP_ZERO) | ||
2470 | + | ||
2471 | +static zend_mm_segment* zend_mm_mem_mmap_realloc(zend_mm_storage *storage, zend_mm_segment* segment, size_t size) | ||
2472 | +{ | ||
2473 | + zend_mm_segment *ret; | ||
2474 | +#ifdef HAVE_MREMAP | ||
2475 | +#if defined(__NetBSD__) | ||
2476 | + /* NetBSD 5 supports mremap but takes an extra newp argument */ | ||
2477 | + ret = (zend_mm_segment*)mremap(segment, segment->size, segment, size, MREMAP_MAYMOVE); | ||
2478 | +#else | ||
2479 | + ret = (zend_mm_segment*)mremap(segment, segment->size, size, MREMAP_MAYMOVE); | ||
2480 | +#endif | ||
2481 | + if (ret == MAP_FAILED) { | ||
2482 | +#endif | ||
2483 | + ret = storage->handlers->_alloc(storage, size); | ||
2484 | + if (ret) { | ||
2485 | + memcpy(ret, segment, size > segment->size ? segment->size : size); | ||
2486 | + storage->handlers->_free(storage, segment); | ||
2487 | + } | ||
2488 | +#ifdef HAVE_MREMAP | ||
2489 | + } | ||
2490 | +#endif | ||
2491 | + return ret; | ||
2492 | +} | ||
2493 | + | ||
2494 | +static void zend_mm_mem_mmap_free(zend_mm_storage *storage, zend_mm_segment* segment) | ||
2495 | +{ | ||
2496 | + munmap((void*)segment, segment->size); | ||
2497 | +} | ||
2498 | + | ||
2499 | +#endif | ||
2500 | + | ||
2501 | +#ifdef HAVE_MEM_MMAP_ANON | ||
2502 | + | ||
2503 | +static zend_mm_segment* zend_mm_mem_mmap_anon_alloc(zend_mm_storage *storage, size_t size) | ||
2504 | +{ | ||
2505 | + zend_mm_segment *ret = (zend_mm_segment*)mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); | ||
2506 | + if (ret == MAP_FAILED) { | ||
2507 | + ret = NULL; | ||
2508 | + } | ||
2509 | + return ret; | ||
2510 | +} | ||
2511 | + | ||
2512 | +# 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} | ||
2513 | + | ||
2514 | +#endif | ||
2515 | + | ||
2516 | +#ifdef HAVE_MEM_MMAP_ZERO | ||
2517 | + | ||
2518 | +static int zend_mm_dev_zero_fd = -1; | ||
2519 | + | ||
2520 | +static zend_mm_storage* zend_mm_mem_mmap_zero_init(void *params) | ||
2521 | +{ | ||
2522 | + if (zend_mm_dev_zero_fd != -1) { | ||
2523 | + zend_mm_dev_zero_fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR); | ||
2524 | + } | ||
2525 | + if (zend_mm_dev_zero_fd >= 0) { | ||
2526 | + return malloc(sizeof(zend_mm_storage)); | ||
2527 | + } else { | ||
2528 | + return NULL; | ||
2529 | + } | ||
2530 | +} | ||
2531 | + | ||
2532 | +static void zend_mm_mem_mmap_zero_dtor(zend_mm_storage *storage) | ||
2533 | +{ | ||
2534 | + close(zend_mm_dev_zero_fd); | ||
2535 | + free(storage); | ||
2536 | +} | ||
2537 | + | ||
2538 | +static zend_mm_segment* zend_mm_mem_mmap_zero_alloc(zend_mm_storage *storage, size_t size) | ||
2539 | +{ | ||
2540 | + zend_mm_segment *ret = (zend_mm_segment*)mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, zend_mm_dev_zero_fd, 0); | ||
2541 | + if (ret == MAP_FAILED) { | ||
2542 | + ret = NULL; | ||
2543 | + } | ||
2544 | + return ret; | ||
2545 | +} | ||
2546 | + | ||
2547 | +# 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} | ||
2548 | + | ||
2549 | +#endif | ||
2550 | + | ||
2551 | +#ifdef HAVE_MEM_WIN32 | ||
2552 | + | ||
2553 | +static zend_mm_storage* zend_mm_mem_win32_init(void *params) | ||
2554 | +{ | ||
2555 | + HANDLE heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); | ||
2556 | + zend_mm_storage* storage; | ||
2557 | + | ||
2558 | + if (heap == NULL) { | ||
2559 | + return NULL; | ||
2560 | + } | ||
2561 | + storage = (zend_mm_storage*)malloc(sizeof(zend_mm_storage)); | ||
2562 | + storage->data = (void*) heap; | ||
2563 | + return storage; | ||
2564 | +} | ||
2565 | + | ||
2566 | +static void zend_mm_mem_win32_dtor(zend_mm_storage *storage) | ||
2567 | +{ | ||
2568 | + HeapDestroy((HANDLE)storage->data); | ||
2569 | + free(storage); | ||
2570 | +} | ||
2571 | + | ||
2572 | +static void zend_mm_mem_win32_compact(zend_mm_storage *storage) | ||
2573 | +{ | ||
2574 | + HeapDestroy((HANDLE)storage->data); | ||
2575 | + storage->data = (void*)HeapCreate(HEAP_NO_SERIALIZE, 0, 0); | ||
2576 | +} | ||
2577 | + | ||
2578 | +static zend_mm_segment* zend_mm_mem_win32_alloc(zend_mm_storage *storage, size_t size) | ||
2579 | +{ | ||
2580 | + return (zend_mm_segment*) HeapAlloc((HANDLE)storage->data, HEAP_NO_SERIALIZE, size); | ||
2581 | +} | ||
2582 | + | ||
2583 | +static void zend_mm_mem_win32_free(zend_mm_storage *storage, zend_mm_segment* segment) | ||
2584 | +{ | ||
2585 | + HeapFree((HANDLE)storage->data, HEAP_NO_SERIALIZE, segment); | ||
2586 | +} | ||
2587 | + | ||
2588 | +static zend_mm_segment* zend_mm_mem_win32_realloc(zend_mm_storage *storage, zend_mm_segment* segment, size_t size) | ||
2589 | +{ | ||
2590 | + return (zend_mm_segment*) HeapReAlloc((HANDLE)storage->data, HEAP_NO_SERIALIZE, segment, size); | ||
2591 | +} | ||
2592 | + | ||
2593 | +# 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} | ||
2594 | + | ||
2595 | +#endif | ||
2596 | + | ||
2597 | +#ifdef HAVE_MEM_MALLOC | ||
2598 | + | ||
2599 | +static zend_mm_segment* zend_mm_mem_malloc_alloc(zend_mm_storage *storage, size_t size) | ||
2600 | +{ | ||
2601 | + return (zend_mm_segment*)malloc(size); | ||
2602 | +} | ||
2603 | + | ||
2604 | +static zend_mm_segment* zend_mm_mem_malloc_realloc(zend_mm_storage *storage, zend_mm_segment *ptr, size_t size) | ||
2605 | +{ | ||
2606 | + return (zend_mm_segment*)realloc(ptr, size); | ||
2607 | +} | ||
2608 | + | ||
2609 | +static void zend_mm_mem_malloc_free(zend_mm_storage *storage, zend_mm_segment *ptr) | ||
2610 | +{ | ||
2611 | + free(ptr); | ||
2612 | +} | ||
2613 | + | ||
2614 | +# 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} | ||
2615 | + | ||
2616 | +#endif | ||
2617 | + | ||
2618 | +static const zend_mm_mem_handlers mem_handlers[] = { | ||
2619 | +#ifdef HAVE_MEM_WIN32 | ||
2620 | + ZEND_MM_MEM_WIN32_DSC, | ||
2621 | +#endif | ||
2622 | +#ifdef HAVE_MEM_MALLOC | ||
2623 | + ZEND_MM_MEM_MALLOC_DSC, | ||
2624 | +#endif | ||
2625 | +#ifdef HAVE_MEM_MMAP_ANON | ||
2626 | + ZEND_MM_MEM_MMAP_ANON_DSC, | ||
2627 | +#endif | ||
2628 | +#ifdef HAVE_MEM_MMAP_ZERO | ||
2629 | + ZEND_MM_MEM_MMAP_ZERO_DSC, | ||
2630 | +#endif | ||
2631 | + {NULL, NULL, NULL, NULL, NULL, NULL} | ||
2632 | +}; | ||
2633 | + | ||
2634 | +# define ZEND_MM_STORAGE_DTOR() heap->storage->handlers->dtor(heap->storage) | ||
2635 | +# define ZEND_MM_STORAGE_ALLOC(size) heap->storage->handlers->_alloc(heap->storage, size) | ||
2636 | +# define ZEND_MM_STORAGE_REALLOC(ptr, size) heap->storage->handlers->_realloc(heap->storage, ptr, size) | ||
2637 | +# define ZEND_MM_STORAGE_FREE(ptr) heap->storage->handlers->_free(heap->storage, ptr) | ||
2638 | + | ||
2639 | +/****************/ | ||
2640 | +/* Heap Manager */ | ||
2641 | +/****************/ | ||
2642 | + | ||
2643 | +#define MEM_BLOCK_VALID 0x7312F8DC | ||
2644 | +#define MEM_BLOCK_FREED 0x99954317 | ||
2645 | +#define MEM_BLOCK_CACHED 0xFB8277DC | ||
2646 | +#define MEM_BLOCK_GUARD 0x2A8FCC84 | ||
2647 | +#define MEM_BLOCK_LEAK 0x6C5E8F2D | ||
2648 | + | ||
2649 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
2650 | +# define CANARY_SIZE sizeof(size_t) | ||
2651 | +#else | ||
2652 | +# define CANARY_SIZE 0 | ||
2653 | +#endif | ||
2654 | + | ||
2655 | +/* mm block type */ | ||
2656 | +typedef struct _zend_mm_block_info_canary { | ||
2657 | +#if ZEND_MM_COOKIES | ||
2658 | + size_t _cookie; | ||
2659 | +#endif | ||
2660 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
2661 | + size_t canary_1; | ||
2662 | +#endif | ||
2663 | + size_t _size; | ||
2664 | + size_t _prev; | ||
2665 | +#if SUHOSIN_PATCH | ||
2666 | + size_t size; | ||
2667 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
2668 | + size_t canary_2; | ||
2669 | +#endif | ||
2670 | +#endif | ||
2671 | +} zend_mm_block_info_canary; | ||
2672 | + | ||
2673 | +#if ZEND_DEBUG | ||
2674 | + | ||
2675 | +typedef struct _zend_mm_debug_info_canary { | ||
2676 | + char *filename; | ||
2677 | + uint lineno; | ||
2678 | + char *orig_filename; | ||
2679 | + uint orig_lineno; | ||
2680 | + size_t size; | ||
2681 | +#if ZEND_MM_HEAP_PROTECTION | ||
2682 | + unsigned int start_magic; | ||
2683 | +#endif | ||
2684 | +} zend_mm_debug_info_canary; | ||
2685 | + | ||
2686 | +#elif ZEND_MM_HEAP_PROTECTION | ||
2687 | + | ||
2688 | +typedef struct _zend_mm_debug_info_canary { | ||
2689 | + size_t size; | ||
2690 | + unsigned int start_magic; | ||
2691 | +} zend_mm_debug_info_canary; | ||
2692 | + | ||
2693 | +#endif | ||
2694 | + | ||
2695 | +typedef struct _zend_mm_block_canary { | ||
2696 | + zend_mm_block_info_canary info; | ||
2697 | +#if ZEND_DEBUG | ||
2698 | + unsigned int magic; | ||
2699 | +# ifdef ZTS | ||
2700 | + THREAD_T thread_id; | ||
2701 | +# endif | ||
2702 | + zend_mm_debug_info_canary debug; | ||
2703 | +#elif ZEND_MM_HEAP_PROTECTION | ||
2704 | + zend_mm_debug_info_canary debug; | ||
2705 | +#endif | ||
2706 | +} zend_mm_block_canary; | ||
2707 | + | ||
2708 | +typedef struct _zend_mm_small_free_block_canary { | ||
2709 | + zend_mm_block_info_canary info; | ||
2710 | +#if ZEND_DEBUG | ||
2711 | + unsigned int magic; | ||
2712 | +# ifdef ZTS | ||
2713 | + THREAD_T thread_id; | ||
2714 | +# endif | ||
2715 | +#endif | ||
2716 | + struct _zend_mm_free_block_canary *prev_free_block; | ||
2717 | + struct _zend_mm_free_block_canary *next_free_block; | ||
2718 | +} zend_mm_small_free_block_canary; | ||
2719 | + | ||
2720 | +typedef struct _zend_mm_free_block_canary { | ||
2721 | + zend_mm_block_info_canary info; | ||
2722 | +#if ZEND_DEBUG | ||
2723 | + unsigned int magic; | ||
2724 | +# ifdef ZTS | ||
2725 | + THREAD_T thread_id; | ||
2726 | +# endif | ||
2727 | +#endif | ||
2728 | + struct _zend_mm_free_block_canary *prev_free_block; | ||
2729 | + struct _zend_mm_free_block_canary *next_free_block; | ||
2730 | + | ||
2731 | + struct _zend_mm_free_block_canary **parent; | ||
2732 | + struct _zend_mm_free_block_canary *child[2]; | ||
2733 | +} zend_mm_free_block_canary; | ||
2734 | + | ||
2735 | +#define ZEND_MM_NUM_BUCKETS (sizeof(size_t) << 3) | ||
2736 | + | ||
2737 | +#define ZEND_MM_CACHE 1 | ||
2738 | +#define ZEND_MM_CACHE_SIZE (ZEND_MM_NUM_BUCKETS * 4 * 1024) | ||
2739 | + | ||
2740 | +#ifndef ZEND_MM_CACHE_STAT | ||
2741 | +# define ZEND_MM_CACHE_STAT 0 | ||
2742 | +#endif | ||
2743 | + | ||
2744 | +typedef struct _zend_mm_heap_canary { | ||
2745 | + int use_zend_alloc; | ||
2746 | + void *(*_malloc)(size_t); | ||
2747 | + void (*_free)(void*); | ||
2748 | + void *(*_realloc)(void*, size_t); | ||
2749 | + size_t free_bitmap; | ||
2750 | + size_t large_free_bitmap; | ||
2751 | + size_t block_size; | ||
2752 | + size_t compact_size; | ||
2753 | + zend_mm_segment *segments_list; | ||
2754 | + zend_mm_storage *storage; | ||
2755 | + size_t real_size; | ||
2756 | + size_t real_peak; | ||
2757 | + size_t limit; | ||
2758 | + size_t size; | ||
2759 | + size_t peak; | ||
2760 | + size_t reserve_size; | ||
2761 | + void *reserve; | ||
2762 | + int overflow; | ||
2763 | + int internal; | ||
2764 | +#if ZEND_MM_CACHE | ||
2765 | + unsigned int cached; | ||
2766 | + zend_mm_free_block_canary *cache[ZEND_MM_NUM_BUCKETS]; | ||
2767 | +#endif | ||
2768 | + zend_mm_free_block_canary *free_buckets[ZEND_MM_NUM_BUCKETS*2]; | ||
2769 | + zend_mm_free_block_canary *large_free_buckets[ZEND_MM_NUM_BUCKETS]; | ||
2770 | + zend_mm_free_block_canary *rest_buckets[2]; | ||
2771 | +#if ZEND_MM_CACHE_STAT | ||
2772 | + struct { | ||
2773 | + int count; | ||
2774 | + int max_count; | ||
2775 | + int hit; | ||
2776 | + int miss; | ||
2777 | + } cache_stat[ZEND_MM_NUM_BUCKETS+1]; | ||
2778 | +#endif | ||
2779 | +#if SUHOSIN_PATCH | ||
2780 | + size_t canary_1,canary_2,canary_3; | ||
2781 | +#endif | ||
2782 | +}; | ||
2783 | + | ||
2784 | +#define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \ | ||
2785 | + (zend_mm_free_block_canary*) ((char*)&heap->free_buckets[index * 2] + \ | ||
2786 | + sizeof(zend_mm_free_block_canary*) * 2 - \ | ||
2787 | + sizeof(zend_mm_small_free_block_canary)) | ||
2788 | + | ||
2789 | +#define ZEND_MM_REST_BUCKET(heap) \ | ||
2790 | + (zend_mm_free_block_canary*)((char*)&heap->rest_buckets[0] + \ | ||
2791 | + sizeof(zend_mm_free_block_canary*) * 2 - \ | ||
2792 | + sizeof(zend_mm_small_free_block_canary)) | ||
2793 | + | ||
2794 | +#if ZEND_MM_COOKIES | ||
2795 | + | ||
2796 | +static unsigned int _zend_mm_cookie = 0; | ||
2797 | + | ||
2798 | +# define ZEND_MM_COOKIE(block) \ | ||
2799 | + (((size_t)(block)) ^ _zend_mm_cookie) | ||
2800 | +# define ZEND_MM_SET_COOKIE(block) \ | ||
2801 | + (block)->info._cookie = ZEND_MM_COOKIE(block) | ||
2802 | +# define ZEND_MM_CHECK_COOKIE(block) \ | ||
2803 | + if (UNEXPECTED((block)->info._cookie != ZEND_MM_COOKIE(block))) { \ | ||
2804 | + zend_mm_panic("zend_mm_heap corrupted"); \ | ||
2805 | + } | ||
2806 | +#else | ||
2807 | +# define ZEND_MM_SET_COOKIE(block) | ||
2808 | +# define ZEND_MM_CHECK_COOKIE(block) | ||
2809 | +#endif | ||
2810 | + | ||
2811 | +/* Default memory segment size */ | ||
2812 | +#define ZEND_MM_SEG_SIZE (256 * 1024) | ||
2813 | + | ||
2814 | +/* Reserved space for error reporting in case of memory overflow */ | ||
2815 | +#define ZEND_MM_RESERVE_SIZE (8*1024) | ||
2816 | + | ||
2817 | +#ifdef _WIN64 | ||
2818 | +# define ZEND_MM_LONG_CONST(x) (x##i64) | ||
2819 | +#else | ||
2820 | +# define ZEND_MM_LONG_CONST(x) (x##L) | ||
2821 | +#endif | ||
2822 | + | ||
2823 | +#define ZEND_MM_TYPE_MASK ZEND_MM_LONG_CONST(0x3) | ||
2824 | + | ||
2825 | +#define ZEND_MM_FREE_BLOCK ZEND_MM_LONG_CONST(0x0) | ||
2826 | +#define ZEND_MM_USED_BLOCK ZEND_MM_LONG_CONST(0x1) | ||
2827 | +#define ZEND_MM_GUARD_BLOCK ZEND_MM_LONG_CONST(0x3) | ||
2828 | + | ||
2829 | +#define ZEND_MM_BLOCK(b, type, size) do { \ | ||
2830 | + size_t _size = (size); \ | ||
2831 | + (b)->info._size = (type) | _size; \ | ||
2832 | + ZEND_MM_BLOCK_AT(b, _size)->info._prev = (type) | _size; \ | ||
2833 | + ZEND_MM_SET_COOKIE(b); \ | ||
2834 | + } while (0); | ||
2835 | +#define ZEND_MM_LAST_BLOCK(b) do { \ | ||
2836 | + (b)->info._size = ZEND_MM_GUARD_BLOCK | ZEND_MM_ALIGNED_HEADER_SIZE; \ | ||
2837 | + ZEND_MM_SET_MAGIC(b, MEM_BLOCK_GUARD); \ | ||
2838 | + } while (0); | ||
2839 | +#define ZEND_MM_BLOCK_SIZE(b) ((b)->info._size & ~ZEND_MM_TYPE_MASK) | ||
2840 | +#define ZEND_MM_IS_FREE_BLOCK(b) (!((b)->info._size & ZEND_MM_USED_BLOCK)) | ||
2841 | +#define ZEND_MM_IS_USED_BLOCK(b) ((b)->info._size & ZEND_MM_USED_BLOCK) | ||
2842 | +#define ZEND_MM_IS_GUARD_BLOCK(b) (((b)->info._size & ZEND_MM_TYPE_MASK) == ZEND_MM_GUARD_BLOCK) | ||
2843 | + | ||
2844 | +#define ZEND_MM_NEXT_BLOCK(b) ZEND_MM_BLOCK_AT(b, ZEND_MM_BLOCK_SIZE(b)) | ||
2845 | +#define ZEND_MM_PREV_BLOCK(b) ZEND_MM_BLOCK_AT(b, -(int)((b)->info._prev & ~ZEND_MM_TYPE_MASK)) | ||
2846 | + | ||
2847 | +#define ZEND_MM_PREV_BLOCK_IS_FREE(b) (!((b)->info._prev & ZEND_MM_USED_BLOCK)) | ||
2848 | + | ||
2849 | +#define ZEND_MM_MARK_FIRST_BLOCK(b) ((b)->info._prev = ZEND_MM_GUARD_BLOCK) | ||
2850 | +#define ZEND_MM_IS_FIRST_BLOCK(b) ((b)->info._prev == ZEND_MM_GUARD_BLOCK) | ||
2851 | + | ||
2852 | +/* optimized access */ | ||
2853 | +#define ZEND_MM_FREE_BLOCK_SIZE(b) (b)->info._size | ||
2854 | + | ||
2855 | +#ifndef ZEND_MM_ALIGNMENT | ||
2856 | +# define ZEND_MM_ALIGNMENT 8 | ||
2857 | +# define ZEND_MM_ALIGNMENT_LOG2 3 | ||
2858 | +#elif ZEND_MM_ALIGNMENT < 4 | ||
2859 | +# undef ZEND_MM_ALIGNMENT | ||
2860 | +# undef ZEND_MM_ALIGNMENT_LOG2 | ||
2861 | +# define ZEND_MM_ALIGNMENT 4 | ||
2862 | +# define ZEND_MM_ALIGNMENT_LOG2 2 | ||
2863 | +#endif | ||
2864 | + | ||
2865 | +#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1) | ||
2866 | + | ||
2867 | +/* Aligned header size */ | ||
2868 | +#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK) | ||
2869 | +#define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block_canary)) | ||
2870 | +#define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block_canary)) | ||
2871 | +#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE + CANARY_SIZE) | ||
2872 | +#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) | ||
2873 | +#define ZEND_MM_ALIGNED_SEGMENT_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_segment)) | ||
2874 | + | ||
2875 | +#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) | ||
2876 | + | ||
2877 | +#define ZEND_MM_MAX_SMALL_SIZE ((ZEND_MM_NUM_BUCKETS<<ZEND_MM_ALIGNMENT_LOG2)+ZEND_MM_ALIGNED_MIN_HEADER_SIZE) | ||
2878 | + | ||
2879 | +#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))) | ||
2880 | + | ||
2881 | +#define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2)) | ||
2882 | + | ||
2883 | +#define ZEND_MM_SMALL_SIZE(true_size) (true_size < ZEND_MM_MAX_SMALL_SIZE) | ||
2884 | + | ||
2885 | +/* Memory calculations */ | ||
2886 | +#define ZEND_MM_BLOCK_AT(blk, offset) ((zend_mm_block_canary *) (((char *) (blk))+(offset))) | ||
2887 | +#define ZEND_MM_DATA_OF(p) ((void *) (((char *) (p))+ZEND_MM_ALIGNED_HEADER_SIZE)) | ||
2888 | +#define ZEND_MM_HEADER_OF(blk) ZEND_MM_BLOCK_AT(blk, -(int)ZEND_MM_ALIGNED_HEADER_SIZE) | ||
2889 | + | ||
2890 | +/* Debug output */ | ||
2891 | +#if ZEND_DEBUG | ||
2892 | + | ||
2893 | +# ifdef ZTS | ||
2894 | +# define ZEND_MM_SET_THREAD_ID(block) \ | ||
2895 | + ((zend_mm_block_canary*)(block))->thread_id = tsrm_thread_id() | ||
2896 | +# define ZEND_MM_BAD_THREAD_ID(block) ((block)->thread_id != tsrm_thread_id()) | ||
2897 | +# else | ||
2898 | +# define ZEND_MM_SET_THREAD_ID(block) | ||
2899 | +# define ZEND_MM_BAD_THREAD_ID(block) 0 | ||
2900 | +# endif | ||
2901 | + | ||
2902 | +# define ZEND_MM_VALID_PTR(block) \ | ||
2903 | + zend_mm_check_ptr(heap, block, 1 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC) | ||
2904 | + | ||
2905 | +# define ZEND_MM_SET_MAGIC(block, val) do { \ | ||
2906 | + (block)->magic = (val); \ | ||
2907 | + } while (0) | ||
2908 | + | ||
2909 | +# define ZEND_MM_CHECK_MAGIC(block, val) do { \ | ||
2910 | + if ((block)->magic != (val)) { \ | ||
2911 | + zend_mm_panic("zend_mm_heap corrupted"); \ | ||
2912 | + } \ | ||
2913 | + } while (0) | ||
2914 | + | ||
2915 | +# define ZEND_MM_SET_DEBUG_INFO(block, __size, set_valid, set_thread) do { \ | ||
2916 | + ((zend_mm_block_canary*)(block))->debug.filename = __zend_filename; \ | ||
2917 | + ((zend_mm_block_canary*)(block))->debug.lineno = __zend_lineno; \ | ||
2918 | + ((zend_mm_block_canary*)(block))->debug.orig_filename = __zend_orig_filename; \ | ||
2919 | + ((zend_mm_block_canary*)(block))->debug.orig_lineno = __zend_orig_lineno; \ | ||
2920 | + ZEND_MM_SET_BLOCK_SIZE(block, __size); \ | ||
2921 | + if (set_valid) { \ | ||
2922 | + ZEND_MM_SET_MAGIC(block, MEM_BLOCK_VALID); \ | ||
2923 | + } \ | ||
2924 | + if (set_thread) { \ | ||
2925 | + ZEND_MM_SET_THREAD_ID(block); \ | ||
2926 | + } \ | ||
2927 | + } while (0) | ||
2928 | + | ||
2929 | +#else | ||
2930 | + | ||
2931 | +# define ZEND_MM_VALID_PTR(ptr) EXPECTED(ptr != NULL) | ||
2932 | + | ||
2933 | +# define ZEND_MM_SET_MAGIC(block, val) | ||
2934 | + | ||
2935 | +# define ZEND_MM_CHECK_MAGIC(block, val) | ||
2936 | + | ||
2937 | +# define ZEND_MM_SET_DEBUG_INFO(block, __size, set_valid, set_thread) ZEND_MM_SET_BLOCK_SIZE(block, __size) | ||
2938 | + | ||
2939 | +#endif | ||
2940 | + | ||
2941 | +#if SUHOSIN_MM_WITH_CANARY_PROTECTION | ||
2942 | + | ||
2943 | +# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) do { \ | ||
2944 | + char *p = SUHOSIN_MM_END_CANARY_PTR(block); size_t check; \ | ||
2945 | + if (((block)->info.canary_1 != heap->canary_1) || ((block)->info.canary_2 != heap->canary_2)) { \ | ||
2946 | + canary_mismatch: \ | ||
2947 | + zend_suhosin_log(S_MEMORY, "canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \ | ||
2948 | + 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; }\ | ||
2949 | + } \ | ||
2950 | + memcpy(&check, p, CANARY_SIZE); \ | ||
2951 | + if (check != heap->canary_3) { \ | ||
2952 | + zend_suhosin_log(S_MEMORY, "end canary mismatch on " MFUNCTION " - heap overflow detected at %p", (block)); \ | ||
2953 | + if (SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) == 0) { _exit(1); } else { memcpy(p, heap->canary_3, CANARY_SIZE); } \ | ||
2954 | + } \ | ||
2955 | + } while (0) | ||
2956 | + | ||
2957 | +# define SUHOSIN_MM_SET_CANARIES(block) do { \ | ||
2958 | + (block)->info.canary_1 = heap->canary_1; \ | ||
2959 | + (block)->info.canary_2 = heap->canary_2; \ | ||
2960 | + } while (0) | ||
2961 | + | ||
2962 | +# define SUHOSIN_MM_END_CANARY_PTR(block) \ | ||
2963 | + (char *)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block_canary*)(block))->info.size + END_MAGIC_SIZE) | ||
2964 | + | ||
2965 | +# define SUHOSIN_MM_SET_END_CANARY(block) do { \ | ||
2966 | + char *p = SUHOSIN_MM_END_CANARY_PTR(block); \ | ||
2967 | + memcpy(p, &heap->canary_3, CANARY_SIZE); \ | ||
2968 | + } while (0) | ||
2969 | + | ||
2970 | +#else | ||
2971 | + | ||
2972 | +# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) | ||
2973 | +# define SUHOSIN_MM_SET_CANARIES(block) | ||
2974 | +# define SUHOSIN_MM_END_CANARY_PTR(block) | ||
2975 | +# define SUHOSIN_MM_SET_END_CANARY(block) | ||
2976 | + | ||
2977 | +#endif | ||
2978 | + | ||
2979 | + | ||
2980 | +#if ZEND_MM_HEAP_PROTECTION | ||
2981 | + | ||
2982 | +# define ZEND_MM_CHECK_PROTECTION(block) \ | ||
2983 | + do { \ | ||
2984 | + if ((block)->debug.start_magic != _mem_block_start_magic || \ | ||
2985 | + memcmp(ZEND_MM_END_MAGIC_PTR(block), &_mem_block_end_magic, END_MAGIC_SIZE) != 0) { \ | ||
2986 | + zend_mm_panic("zend_mm_heap corrupted"); \ | ||
2987 | + } \ | ||
2988 | + } while (0) | ||
2989 | + | ||
2990 | +# define ZEND_MM_END_MAGIC_PTR(block) \ | ||
2991 | + (((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block_canary*)(block))->debug.size) | ||
2992 | + | ||
2993 | +# define END_MAGIC_SIZE sizeof(unsigned int) | ||
2994 | + | ||
2995 | +# define ZEND_MM_SET_BLOCK_SIZE(block, __size) do { \ | ||
2996 | + char *p; \ | ||
2997 | + ((zend_mm_block_canary*)(block))->debug.size = (__size); \ | ||
2998 | + p = ZEND_MM_END_MAGIC_PTR(block); \ | ||
2999 | + ((zend_mm_block_canary*)(block))->debug.start_magic = _mem_block_start_magic; \ | ||
3000 | + memcpy(p, &_mem_block_end_magic, END_MAGIC_SIZE); \ | ||
3001 | + } while (0) | ||
3002 | + | ||
3003 | +static unsigned int _mem_block_start_magic = 0; | ||
3004 | +static unsigned int _mem_block_end_magic = 0; | ||
3005 | + | ||
3006 | +#else | ||
3007 | + | ||
3008 | +# if ZEND_DEBUG | ||
3009 | +# define ZEND_MM_SET_BLOCK_SIZE(block, _size) \ | ||
3010 | + ((zend_mm_block_canary*)(block))->debug.size = (_size) | ||
3011 | +# else | ||
3012 | +# define ZEND_MM_SET_BLOCK_SIZE(block, _size) | ||
3013 | +# endif | ||
3014 | + | ||
3015 | +# define ZEND_MM_CHECK_PROTECTION(block) | ||
3016 | + | ||
3017 | +# define END_MAGIC_SIZE 0 | ||
3018 | + | ||
3019 | +#endif | ||
3020 | + | ||
3021 | +#if ZEND_MM_SAFE_UNLINKING | ||
3022 | +# define ZEND_MM_CHECK_BLOCK_LINKAGE(block) \ | ||
3023 | + if (UNEXPECTED((block)->info._size != ZEND_MM_BLOCK_AT(block, ZEND_MM_FREE_BLOCK_SIZE(block))->info._prev) || \ | ||
3024 | + UNEXPECTED(!UNEXPECTED(ZEND_MM_IS_FIRST_BLOCK(block)) && \ | ||
3025 | + UNEXPECTED(ZEND_MM_PREV_BLOCK(block)->info._size != (block)->info._prev))) { \ | ||
3026 | + zend_mm_panic("zend_mm_heap corrupted"); \ | ||
3027 | + } | ||
3028 | +#define ZEND_MM_CHECK_TREE(block) \ | ||
3029 | + if (UNEXPECTED(*((block)->parent) != (block))) { \ | ||
3030 | + zend_mm_panic("zend_mm_heap corrupted"); \ | ||
3031 | + } | ||
3032 | +#else | ||
3033 | +# define ZEND_MM_CHECK_BLOCK_LINKAGE(block) | ||
3034 | +# define ZEND_MM_CHECK_TREE(block) | ||
3035 | +#endif | ||
3036 | + | ||
3037 | +#define ZEND_MM_LARGE_BUCKET_INDEX(S) zend_mm_high_bit(S) | ||
3038 | + | ||
3039 | +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; | ||
3040 | +void _zend_mm_free_canary_int(zend_mm_heap_canary *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); | ||
3041 | +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); | ||
3042 | + | ||
3043 | + | ||
3044 | +static inline unsigned int zend_mm_high_bit(size_t _size) | ||
3045 | +{ | ||
3046 | +#if defined(__GNUC__) && defined(i386) | ||
3047 | + unsigned int n; | ||
3048 | + | ||
3049 | + __asm__("bsrl %1,%0\n\t" : "=r" (n) : "rm" (_size)); | ||
3050 | + return n; | ||
3051 | +#elif defined(__GNUC__) && defined(__x86_64__) | ||
3052 | + unsigned long n; | ||
3053 | + | ||
3054 | + __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size)); | ||
3055 | + return (unsigned int)n; | ||
3056 | +#elif defined(_MSC_VER) && defined(_M_IX86) | ||
3057 | + __asm { | ||
3058 | + bsr eax, _size | ||
3059 | + } | ||
3060 | +#else | ||
3061 | + unsigned int n = 0; | ||
3062 | + while (_size != 0) { | ||
3063 | + _size = _size >> 1; | ||
3064 | + n++; | ||
3065 | + } | ||
3066 | + return n-1; | ||
3067 | +#endif | ||
3068 | +} | ||
3069 | + | ||
3070 | +static inline unsigned int zend_mm_low_bit(size_t _size) | ||
3071 | +{ | ||
3072 | +#if defined(__GNUC__) && defined(i386) | ||
3073 | + unsigned int n; | ||
3074 | + | ||
3075 | + __asm__("bsfl %1,%0\n\t" : "=r" (n) : "rm" (_size)); | ||
3076 | + return n; | ||
3077 | +#elif defined(__GNUC__) && defined(__x86_64__) | ||
3078 | + unsigned long n; | ||
3079 | + | ||
3080 | + __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size)); | ||
3081 | + return (unsigned int)n; | ||
3082 | +#elif defined(_MSC_VER) && defined(_M_IX86) | ||
3083 | + __asm { | ||
3084 | + bsf eax, _size | ||
3085 | + } | ||
3086 | +#else | ||
3087 | + static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0}; | ||
3088 | + unsigned int n; | ||
3089 | + unsigned int index = 0; | ||
3090 | + | ||
3091 | + n = offset[_size & 15]; | ||
3092 | + while (n == 4) { | ||
3093 | + _size >>= 4; | ||
3094 | + index += n; | ||
3095 | + n = offset[_size & 15]; | ||
3096 | + } | ||
3097 | + | ||
3098 | + return index + n; | ||
3099 | +#endif | ||
3100 | +} | ||
3101 | + | ||
3102 | +static void zend_mm_add_to_rest_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block) | ||
3103 | +{ | ||
3104 | + zend_mm_free_block_canary *prev, *next; | ||
3105 | + | ||
3106 | + ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_FREED); | ||
3107 | + | ||
3108 | + if (!ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block))) { | ||
3109 | + mm_block->parent = NULL; | ||
3110 | + } | ||
3111 | + | ||
3112 | + prev = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]); | ||
3113 | + next = SUHOSIN_MANGLE_PTR(prev->next_free_block); | ||
3114 | + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); | ||
3115 | + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); | ||
3116 | + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); | ||
3117 | +} | ||
3118 | + | ||
3119 | +static void zend_mm_add_to_free_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block) | ||
3120 | +{ | ||
3121 | + size_t size; | ||
3122 | + size_t index; | ||
3123 | + | ||
3124 | + ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_FREED); | ||
3125 | + | ||
3126 | + size = ZEND_MM_FREE_BLOCK_SIZE(mm_block); | ||
3127 | + if (EXPECTED(!ZEND_MM_SMALL_SIZE(size))) { | ||
3128 | + zend_mm_free_block_canary **p; | ||
3129 | + | ||
3130 | + index = ZEND_MM_LARGE_BUCKET_INDEX(size); | ||
3131 | + p = &heap->large_free_buckets[index]; | ||
3132 | + mm_block->child[0] = mm_block->child[1] = NULL; | ||
3133 | + if (!*p) { | ||
3134 | + *p = mm_block; | ||
3135 | + mm_block->parent = p; | ||
3136 | + mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block); | ||
3137 | + heap->large_free_bitmap |= (ZEND_MM_LONG_CONST(1) << index); | ||
3138 | + } else { | ||
3139 | + size_t m; | ||
3140 | + | ||
3141 | + for (m = size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) { | ||
3142 | + zend_mm_free_block_canary *prev = *p; | ||
3143 | + | ||
3144 | + if (ZEND_MM_FREE_BLOCK_SIZE(prev) != size) { | ||
3145 | + p = &prev->child[(m >> (ZEND_MM_NUM_BUCKETS-1)) & 1]; | ||
3146 | + if (!*p) { | ||
3147 | + *p = mm_block; | ||
3148 | + mm_block->parent = p; | ||
3149 | + mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block); | ||
3150 | + break; | ||
3151 | + } | ||
3152 | + } else { | ||
3153 | + zend_mm_free_block_canary *next = SUHOSIN_MANGLE_PTR(prev->next_free_block); | ||
3154 | + | ||
3155 | + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); | ||
3156 | + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); | ||
3157 | + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); | ||
3158 | + mm_block->parent = NULL; | ||
3159 | + break; | ||
3160 | + } | ||
3161 | + } | ||
3162 | + } | ||
3163 | + } else { | ||
3164 | + zend_mm_free_block_canary *prev, *next; | ||
3165 | + | ||
3166 | + index = ZEND_MM_BUCKET_INDEX(size); | ||
3167 | + | ||
3168 | + prev = ZEND_MM_SMALL_FREE_BUCKET(heap, index); | ||
3169 | + if (SUHOSIN_MANGLE_PTR(prev->prev_free_block) == prev) { | ||
3170 | + heap->free_bitmap |= (ZEND_MM_LONG_CONST(1) << index); | ||
3171 | + } | ||
3172 | + next = SUHOSIN_MANGLE_PTR(prev->next_free_block); | ||
3173 | + | ||
3174 | + mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev); | ||
3175 | + mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next); | ||
3176 | + prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block); | ||
3177 | + } | ||
3178 | +} | ||
3179 | + | ||
3180 | +static void zend_mm_remove_from_free_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block) | ||
3181 | +{ | ||
3182 | + zend_mm_free_block_canary *prev = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block); | ||
3183 | + zend_mm_free_block_canary *next = SUHOSIN_MANGLE_PTR(mm_block->next_free_block); | ||
3184 | + | ||
3185 | + ZEND_MM_CHECK_MAGIC(mm_block, MEM_BLOCK_FREED); | ||
3186 | + | ||
3187 | + if (EXPECTED(prev == mm_block)) { | ||
3188 | + zend_mm_free_block_canary **rp, **cp; | ||
3189 | + | ||
3190 | +#if SUHOSIN_PATCH | ||
3191 | + if (next != mm_block) { | ||
3192 | + zend_suhosin_log(S_MEMORY, "zend_mm_heap corrupted at %p", mm_block); | ||
3193 | + _exit(1); | ||
3194 | + } | ||
3195 | +#endif | ||
3196 | +#if ZEND_MM_SAFE_UNLINKING | ||
3197 | + if (UNEXPECTED(next != mm_block)) { | ||
3198 | + zend_mm_panic("zend_mm_heap corrupted"); | ||
3199 | + } | ||
3200 | +#endif | ||
3201 | + | ||
3202 | + rp = &mm_block->child[mm_block->child[1] != NULL]; | ||
3203 | + prev = *rp; | ||
3204 | + if (EXPECTED(prev == NULL)) { | ||
3205 | + size_t index = ZEND_MM_LARGE_BUCKET_INDEX(ZEND_MM_FREE_BLOCK_SIZE(mm_block)); | ||
3206 | + | ||
3207 | + ZEND_MM_CHECK_TREE(mm_block); | ||
3208 | + *mm_block->parent = NULL; | ||
3209 | + if (mm_block->parent == &heap->large_free_buckets[index]) { | ||
3210 | + heap->large_free_bitmap &= ~(ZEND_MM_LONG_CONST(1) << index); | ||
3211 | + } | ||
3212 | + } else { | ||
3213 | + while (*(cp = &(prev->child[prev->child[1] != NULL])) != NULL) { | ||
3214 | + prev = *cp; | ||
3215 | + rp = cp; | ||
3216 | + } | ||
3217 | + *rp = NULL; | ||
3218 | + | ||
3219 | +subst_block: | ||
3220 | + ZEND_MM_CHECK_TREE(mm_block); | ||
3221 | + *mm_block->parent = prev; | ||
3222 | + prev->parent = mm_block->parent; | ||
3223 | + if ((prev->child[0] = mm_block->child[0])) { | ||
3224 | + ZEND_MM_CHECK_TREE(prev->child[0]); | ||
3225 | + prev->child[0]->parent = &prev->child[0]; | ||
3226 | + } | ||
3227 | + if ((prev->child[1] = mm_block->child[1])) { | ||
3228 | + ZEND_MM_CHECK_TREE(prev->child[1]); | ||
3229 | + prev->child[1]->parent = &prev->child[1]; | ||
3230 | + } | ||
3231 | + } | ||
3232 | + } else { | ||
3233 | + | ||
3234 | +#if SUHOSIN_PATCH | ||
3235 | + if (SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block || SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block) { | ||
3236 | + zend_suhosin_log(S_MEMORY, "zend_mm_head corrupted at %p", mm_block); | ||
3237 | + _exit(1); | ||
3238 | + } | ||
3239 | +#endif | ||
3240 | + | ||
3241 | +#if ZEND_MM_SAFE_UNLINKING | ||
3242 | + if (UNEXPECTED(SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block) || UNEXPECTED(SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block)) { | ||
3243 | + zend_mm_panic("zend_mm_heap corrupted"); | ||
3244 | + } | ||
3245 | +#endif | ||
3246 | + | ||
3247 | + prev->next_free_block = SUHOSIN_MANGLE_PTR(next); | ||
3248 | + next->prev_free_block = SUHOSIN_MANGLE_PTR(prev); | ||
3249 | + | ||
3250 | + if (EXPECTED(ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block)))) { | ||
3251 | + if (EXPECTED(prev == next)) { | ||
3252 | + size_t index = ZEND_MM_BUCKET_INDEX(ZEND_MM_FREE_BLOCK_SIZE(mm_block)); | ||
3253 | + | ||
3254 | + if (EXPECTED(heap->free_buckets[index*2] == heap->free_buckets[index*2+1])) { | ||
3255 | + heap->free_bitmap &= ~(ZEND_MM_LONG_CONST(1) << index); | ||
3256 | + } | ||
3257 | + } | ||
3258 | + } else if (UNEXPECTED(mm_block->parent != NULL)) { | ||
3259 | + goto subst_block; | ||
3260 | + } | ||
3261 | + } | ||
3262 | +} | ||
3263 | + | ||
3264 | +static void zend_mm_init(zend_mm_heap_canary *heap) | ||
3265 | +{ | ||
3266 | + zend_mm_free_block_canary* p; | ||
3267 | + int i; | ||
3268 | + | ||
3269 | + heap->free_bitmap = 0; | ||
3270 | + heap->large_free_bitmap = 0; | ||
3271 | +#if ZEND_MM_CACHE | ||
3272 | + heap->cached = 0; | ||
3273 | + memset(heap->cache, 0, sizeof(heap->cache)); | ||
3274 | +#endif | ||
3275 | +#if ZEND_MM_CACHE_STAT | ||
3276 | + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { | ||
3277 | + heap->cache_stat[i].count = 0; | ||
3278 | + } | ||
3279 | +#endif | ||
3280 | + p = ZEND_MM_SMALL_FREE_BUCKET(heap, 0); | ||
3281 | + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { | ||
3282 | + p->next_free_block = SUHOSIN_MANGLE_PTR(p); | ||
3283 | + p->prev_free_block = SUHOSIN_MANGLE_PTR(p); | ||
3284 | + p = (zend_mm_free_block_canary*)((char*)p + sizeof(zend_mm_free_block_canary*) * 2); | ||
3285 | + heap->large_free_buckets[i] = NULL; | ||
3286 | + } | ||
3287 | + heap->rest_buckets[0] = heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(heap)); | ||
3288 | +#if SUHOSIN_PATCH | ||
3289 | + if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) { | ||
3290 | + zend_canary(&heap->canary_1, sizeof(heap->canary_1)); | ||
3291 | + zend_canary(&heap->canary_2, sizeof(heap->canary_2)); | ||
3292 | + zend_canary(&heap->canary_3, sizeof(heap->canary_3)); | ||
3293 | + } | ||
3294 | +#endif | ||
3295 | +} | ||
3296 | + | ||
3297 | +static void zend_mm_del_segment(zend_mm_heap_canary *heap, zend_mm_segment *segment) | ||
3298 | +{ | ||
3299 | + zend_mm_segment **p = &heap->segments_list; | ||
3300 | + | ||
3301 | + while (*p != segment) { | ||
3302 | + p = &(*p)->next_segment; | ||
3303 | + } | ||
3304 | + *p = segment->next_segment; | ||
3305 | + heap->real_size -= segment->size; | ||
3306 | + ZEND_MM_STORAGE_FREE(segment); | ||
3307 | +} | ||
3308 | + | ||
3309 | +#if ZEND_MM_CACHE | ||
3310 | +static void zend_mm_free_cache(zend_mm_heap_canary *heap) | ||
3311 | +{ | ||
3312 | + int i; | ||
3313 | + | ||
3314 | + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { | ||
3315 | + /* SUHOSIN_MANGLE_PTR should NOT affect NULL pointers */ | ||
3316 | + if (heap->cache[i]) { | ||
3317 | + zend_mm_free_block_canary *mm_block = SUHOSIN_MANGLE_PTR(heap->cache[i]); | ||
3318 | + | ||
3319 | + while (mm_block) { | ||
3320 | + size_t size = ZEND_MM_BLOCK_SIZE(mm_block); | ||
3321 | + zend_mm_free_block_canary *q = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block); | ||
3322 | + zend_mm_block_canary *next_block = ZEND_MM_NEXT_BLOCK(mm_block); | ||
3323 | + | ||
3324 | + heap->cached -= size; | ||
3325 | + | ||
3326 | + if (ZEND_MM_PREV_BLOCK_IS_FREE(mm_block)) { | ||
3327 | + mm_block = (zend_mm_free_block_canary*)ZEND_MM_PREV_BLOCK(mm_block); | ||
3328 | + size += ZEND_MM_FREE_BLOCK_SIZE(mm_block); | ||
3329 | + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) mm_block); | ||
3330 | + } | ||
3331 | + if (ZEND_MM_IS_FREE_BLOCK(next_block)) { | ||
3332 | + size += ZEND_MM_FREE_BLOCK_SIZE(next_block); | ||
3333 | + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block); | ||
3334 | + } | ||
3335 | + ZEND_MM_BLOCK(mm_block, ZEND_MM_FREE_BLOCK, size); | ||
3336 | + | ||
3337 | + if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && | ||
3338 | + ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_NEXT_BLOCK(mm_block))) { | ||
3339 | + zend_mm_del_segment(heap, (zend_mm_segment *) ((char *)mm_block - ZEND_MM_ALIGNED_SEGMENT_SIZE)); | ||
3340 | + } else { | ||
3341 | + zend_mm_add_to_free_list(heap, (zend_mm_free_block_canary *) mm_block); | ||
3342 | + } | ||
3343 | + | ||
3344 | + mm_block = q; | ||
3345 | + } | ||
3346 | + heap->cache[i] = NULL; | ||
3347 | +#if ZEND_MM_CACHE_STAT | ||
3348 | + heap->cache_stat[i].count = 0; | ||
3349 | +#endif | ||
3350 | + } | ||
3351 | + } | ||
3352 | +} | ||
3353 | +#endif | ||
3354 | + | ||
3355 | +#if ZEND_MM_HEAP_PROTECTION || ZEND_MM_COOKIES | ||
3356 | +static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */ | ||
3357 | +{ | ||
3358 | + size_t i = 0; | ||
3359 | + unsigned char t; | ||
3360 | + | ||
3361 | +#ifdef ZEND_WIN32 | ||
3362 | + HCRYPTPROV hCryptProv; | ||
3363 | + int has_context = 0; | ||
3364 | + | ||
3365 | + if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) { | ||
3366 | + /* Could mean that the key container does not exist, let try | ||
3367 | + again by asking for a new one */ | ||
3368 | + if (GetLastError() == NTE_BAD_KEYSET) { | ||
3369 | + if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) { | ||
3370 | + has_context = 1; | ||
3371 | + } | ||
3372 | + } | ||
3373 | + } else { | ||
3374 | + has_context = 1; | ||
3375 | + } | ||
3376 | + if (has_context) { | ||
3377 | + do { | ||
3378 | + BOOL ret = CryptGenRandom(hCryptProv, size, buf); | ||
3379 | + CryptReleaseContext(hCryptProv, 0); | ||
3380 | + if (ret) { | ||
3381 | + while (i < size && buf[i] != 0) { | ||
3382 | + i++; | ||
3383 | + } | ||
3384 | + if (i == size) { | ||
3385 | + return; | ||
3386 | + } | ||
3387 | + } | ||
3388 | + } while (0); | ||
3389 | + } | ||
3390 | +#elif defined(HAVE_DEV_URANDOM) | ||
3391 | + int fd = open("/dev/urandom", 0); | ||
3392 | + | ||
3393 | + if (fd >= 0) { | ||
3394 | + if (read(fd, buf, size) == size) { | ||
3395 | + while (i < size && buf[i] != 0) { | ||
3396 | + i++; | ||
3397 | + } | ||
3398 | + if (i == size) { | ||
3399 | + close(fd); | ||
3400 | + return; | ||
3401 | + } | ||
3402 | + } | ||
3403 | + close(fd); | ||
3404 | + } | ||
3405 | +#endif | ||
3406 | + t = (unsigned char)getpid(); | ||
3407 | + while (i < size) { | ||
3408 | + do { | ||
3409 | + buf[i] = ((unsigned char)rand()) ^ t; | ||
3410 | + } while (buf[i] == 0); | ||
3411 | + t = buf[i++] << 1; | ||
3412 | + } | ||
3413 | +} | ||
3414 | +/* }}} */ | ||
3415 | +#endif | ||
3416 | + | ||
3417 | + | ||
3418 | +/* Notes: | ||
3419 | + * - This function may alter the block_sizes values to match platform alignment | ||
3420 | + * - This function does *not* perform sanity checks on the arguments | ||
3421 | + */ | ||
3422 | +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) | ||
3423 | +{ | ||
3424 | + zend_mm_storage *storage; | ||
3425 | + zend_mm_heap_canary *heap; | ||
3426 | + zend_mm_free_block_canary *tmp; | ||
3427 | + | ||
3428 | +#if 0 | ||
3429 | + int i; | ||
3430 | + | ||
3431 | + printf("ZEND_MM_ALIGNMENT=%d\n", ZEND_MM_ALIGNMENT); | ||
3432 | + printf("ZEND_MM_ALIGNMENT_LOG2=%d\n", ZEND_MM_ALIGNMENT_LOG2); | ||
3433 | + printf("ZEND_MM_MIN_SIZE=%d\n", ZEND_MM_MIN_SIZE); | ||
3434 | + printf("ZEND_MM_MAX_SMALL_SIZE=%d\n", ZEND_MM_MAX_SMALL_SIZE); | ||
3435 | + printf("ZEND_MM_ALIGNED_HEADER_SIZE=%d\n", ZEND_MM_ALIGNED_HEADER_SIZE); | ||
3436 | + printf("ZEND_MM_ALIGNED_FREE_HEADER_SIZE=%d\n", ZEND_MM_ALIGNED_FREE_HEADER_SIZE); | ||
3437 | + printf("ZEND_MM_MIN_ALLOC_BLOCK_SIZE=%d\n", ZEND_MM_MIN_ALLOC_BLOCK_SIZE); | ||
3438 | + printf("ZEND_MM_ALIGNED_MIN_HEADER_SIZE=%d\n", ZEND_MM_ALIGNED_MIN_HEADER_SIZE); | ||
3439 | + printf("ZEND_MM_ALIGNED_SEGMENT_SIZE=%d\n", ZEND_MM_ALIGNED_SEGMENT_SIZE); | ||
3440 | + for (i = 0; i < ZEND_MM_MAX_SMALL_SIZE; i++) { | ||
3441 | + 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))); | ||
3442 | + } | ||
3443 | + exit(0); | ||
3444 | +#endif | ||
3445 | + | ||
3446 | +#if ZEND_MM_HEAP_PROTECTION | ||
3447 | + if (_mem_block_start_magic == 0) { | ||
3448 | + zend_mm_random((unsigned char*)&_mem_block_start_magic, sizeof(_mem_block_start_magic)); | ||
3449 | + } | ||
3450 | + if (_mem_block_end_magic == 0) { | ||
3451 | + zend_mm_random((unsigned char*)&_mem_block_end_magic, sizeof(_mem_block_end_magic)); | ||
3452 | + } | ||
3453 | +#endif | ||
3454 | +#if ZEND_MM_COOKIES | ||
3455 | + if (_zend_mm_cookie == 0) { | ||
3456 | + zend_mm_random((unsigned char*)&_zend_mm_cookie, sizeof(_zend_mm_cookie)); | ||
3457 | + } | ||
3458 | +#endif | ||
3459 | + | ||
3460 | + /* get the pointer guardian and ensure low 3 bits are 1 */ | ||
3461 | + if (SUHOSIN_POINTER_GUARD == 0) { | ||
3462 | + zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD)); | ||
3463 | + SUHOSIN_POINTER_GUARD |= 7; | ||
3464 | + } | ||
3465 | + | ||
3466 | + if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) { | ||
3467 | + fprintf(stderr, "'block_size' must be a power of two\n"); | ||
3468 | +/* See http://support.microsoft.com/kb/190351 */ | ||
3469 | +#ifdef PHP_WIN32 | ||
3470 | + fflush(stderr); | ||
3471 | +#endif | ||
3472 | + exit(255); | ||
3473 | + } | ||
3474 | + storage = handlers->init(params); | ||
3475 | + if (!storage) { | ||
3476 | + fprintf(stderr, "Cannot initialize zend_mm storage [%s]\n", handlers->name); | ||
3477 | +/* See http://support.microsoft.com/kb/190351 */ | ||
3478 | +#ifdef PHP_WIN32 | ||
3479 | + fflush(stderr); | ||
3480 | +#endif | ||
3481 | + exit(255); | ||
3482 | + } | ||
3483 | + storage->handlers = handlers; | ||
3484 | + | ||
3485 | + heap = malloc(sizeof(struct _zend_mm_heap_canary)); | ||
3486 | + | ||
3487 | + heap->storage = storage; | ||
3488 | + heap->block_size = block_size; | ||
3489 | + heap->compact_size = 0; | ||
3490 | + heap->segments_list = NULL; | ||
3491 | + zend_mm_init(heap); | ||
3492 | +# if ZEND_MM_CACHE_STAT | ||
3493 | + memset(heap->cache_stat, 0, sizeof(heap->cache_stat)); | ||
3494 | +# endif | ||
3495 | + | ||
3496 | + heap->use_zend_alloc = 1; | ||
3497 | + heap->real_size = 0; | ||
3498 | + heap->overflow = 0; | ||
3499 | + heap->real_peak = 0; | ||
3500 | + heap->limit = ZEND_MM_LONG_CONST(1)<<(ZEND_MM_NUM_BUCKETS-2); | ||
3501 | + heap->size = 0; | ||
3502 | + heap->peak = 0; | ||
3503 | + heap->internal = internal; | ||
3504 | + heap->reserve = NULL; | ||
3505 | + heap->reserve_size = reserve_size; | ||
3506 | + if (reserve_size > 0) { | ||
3507 | + heap->reserve = _zend_mm_alloc((zend_mm_heap *)heap, reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
3508 | + } | ||
3509 | + if (internal) { | ||
3510 | + int i; | ||
3511 | + zend_mm_free_block_canary *p, *q, *orig; | ||
3512 | + 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); | ||
3513 | + | ||
3514 | + *mm_heap = *heap; | ||
3515 | + | ||
3516 | + p = ZEND_MM_SMALL_FREE_BUCKET(mm_heap, 0); | ||
3517 | + orig = ZEND_MM_SMALL_FREE_BUCKET(heap, 0); | ||
3518 | + for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) { | ||
3519 | + q = p; | ||
3520 | + while (SUHOSIN_MANGLE_PTR(q->prev_free_block) != orig) { | ||
3521 | + q = SUHOSIN_MANGLE_PTR(q->prev_free_block); | ||
3522 | + } | ||
3523 | + q->prev_free_block = SUHOSIN_MANGLE_PTR(p); | ||
3524 | + q = p; | ||
3525 | + while (SUHOSIN_MANGLE_PTR(q->next_free_block) != orig) { | ||
3526 | + q = SUHOSIN_MANGLE_PTR(q->next_free_block); | ||
3527 | + } | ||
3528 | + q->next_free_block = SUHOSIN_MANGLE_PTR(p); | ||
3529 | + p = (zend_mm_free_block_canary*)((char*)p + sizeof(zend_mm_free_block_canary*) * 2); | ||
3530 | + orig = (zend_mm_free_block_canary*)((char*)orig + sizeof(zend_mm_free_block_canary*) * 2); | ||
3531 | + if (mm_heap->large_free_buckets[i]) { | ||
3532 | + mm_heap->large_free_buckets[i]->parent = &mm_heap->large_free_buckets[i]; | ||
3533 | + } | ||
3534 | + } | ||
3535 | + mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(mm_heap)); | ||
3536 | + | ||
3537 | + free(heap); | ||
3538 | + heap = mm_heap; | ||
3539 | + } | ||
3540 | + return heap; | ||
3541 | +} | ||
3542 | + | ||
3543 | +zend_mm_heap_canary *__zend_mm_startup_canary(void) | ||
3544 | +{ | ||
3545 | + int i; | ||
3546 | + size_t seg_size; | ||
3547 | + char *mem_type = getenv("ZEND_MM_MEM_TYPE"); | ||
3548 | + char *tmp; | ||
3549 | + const zend_mm_mem_handlers *handlers; | ||
3550 | + zend_mm_heap_canary *heap; | ||
3551 | + | ||
3552 | + if (mem_type == NULL) { | ||
3553 | + i = 0; | ||
3554 | + } else { | ||
3555 | + for (i = 0; mem_handlers[i].name; i++) { | ||
3556 | + if (strcmp(mem_handlers[i].name, mem_type) == 0) { | ||
3557 | + break; | ||
3558 | + } | ||
3559 | + } | ||
3560 | + if (!mem_handlers[i].name) { | ||
3561 | + fprintf(stderr, "Wrong or unsupported zend_mm storage type '%s'\n", mem_type); | ||
3562 | + fprintf(stderr, " supported types:\n"); | ||
3563 | +/* See http://support.microsoft.com/kb/190351 */ | ||
3564 | +#ifdef PHP_WIN32 | ||
3565 | + fflush(stderr); | ||
3566 | +#endif | ||
3567 | + for (i = 0; mem_handlers[i].name; i++) { | ||
3568 | + fprintf(stderr, " '%s'\n", mem_handlers[i].name); | ||
3569 | + } | ||
3570 | +/* See http://support.microsoft.com/kb/190351 */ | ||
3571 | +#ifdef PHP_WIN32 | ||
3572 | + fflush(stderr); | ||
3573 | +#endif | ||
3574 | + exit(255); | ||
3575 | + } | ||
3576 | + } | ||
3577 | + handlers = &mem_handlers[i]; | ||
3578 | + | ||
3579 | + tmp = getenv("ZEND_MM_SEG_SIZE"); | ||
3580 | + if (tmp) { | ||
3581 | + seg_size = zend_atoi(tmp, 0); | ||
3582 | + if (zend_mm_low_bit(seg_size) != zend_mm_high_bit(seg_size)) { | ||
3583 | + fprintf(stderr, "ZEND_MM_SEG_SIZE must be a power of two\n"); | ||
3584 | +/* See http://support.microsoft.com/kb/190351 */ | ||
3585 | +#ifdef PHP_WIN32 | ||
3586 | + fflush(stderr); | ||
3587 | +#endif | ||
3588 | + exit(255); | ||
3589 | + } else if (seg_size < ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE) { | ||
3590 | + fprintf(stderr, "ZEND_MM_SEG_SIZE is too small\n"); | ||
3591 | +/* See http://support.microsoft.com/kb/190351 */ | ||
3592 | +#ifdef PHP_WIN32 | ||
3593 | + fflush(stderr); | ||
3594 | +#endif | ||
3595 | + exit(255); | ||
3596 | + } | ||
3597 | + } else { | ||
3598 | + seg_size = ZEND_MM_SEG_SIZE; | ||
3599 | + } | ||
3600 | + | ||
3601 | + heap = __zend_mm_startup_canary_ex(handlers, seg_size, ZEND_MM_RESERVE_SIZE, 0, NULL); | ||
3602 | + if (heap) { | ||
3603 | + tmp = getenv("ZEND_MM_COMPACT"); | ||
3604 | + if (tmp) { | ||
3605 | + heap->compact_size = zend_atoi(tmp, 0); | ||
3606 | + } else { | ||
3607 | + heap->compact_size = 2 * 1024 * 1024; | ||
3608 | + } | ||
3609 | + } | ||
3610 | + return heap; | ||
3611 | +} | ||
3612 | + | ||
3613 | +#if ZEND_DEBUG | ||
3614 | +static long zend_mm_find_leaks(zend_mm_segment *segment, zend_mm_block_canary *b) | ||
3615 | +{ | ||
3616 | + long leaks = 0; | ||
3617 | + zend_mm_block_canary *p, *q; | ||
3618 | + | ||
3619 | + p = ZEND_MM_NEXT_BLOCK(b); | ||
3620 | + while (1) { | ||
3621 | + if (ZEND_MM_IS_GUARD_BLOCK(p)) { | ||
3622 | + ZEND_MM_CHECK_MAGIC(p, MEM_BLOCK_GUARD); | ||
3623 | + segment = segment->next_segment; | ||
3624 | + if (!segment) { | ||
3625 | + break; | ||
3626 | + } | ||
3627 | + p = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); | ||
3628 | + continue; | ||
3629 | + } | ||
3630 | + q = ZEND_MM_NEXT_BLOCK(p); | ||
3631 | + if (q <= p || | ||
3632 | + (char*)q > (char*)segment + segment->size || | ||
3633 | + p->info._size != q->info._prev) { | ||
3634 | + zend_mm_panic("zend_mm_heap corrupted"); | ||
3635 | + } | ||
3636 | + if (!ZEND_MM_IS_FREE_BLOCK(p)) { | ||
3637 | + if (p->magic == MEM_BLOCK_VALID) { | ||
3638 | + if (p->debug.filename==b->debug.filename && p->debug.lineno==b->debug.lineno) { | ||
3639 | + ZEND_MM_SET_MAGIC(p, MEM_BLOCK_LEAK); | ||
3640 | + leaks++; | ||
3641 | + } | ||
3642 | +#if ZEND_MM_CACHE | ||
3643 | + } else if (p->magic == MEM_BLOCK_CACHED) { | ||
3644 | + /* skip it */ | ||
3645 | +#endif | ||
3646 | + } else if (p->magic != MEM_BLOCK_LEAK) { | ||
3647 | + zend_mm_panic("zend_mm_heap corrupted"); | ||
3648 | + } | ||
3649 | + } | ||
3650 | + p = q; | ||
3651 | + } | ||
3652 | + return leaks; | ||
3653 | +} | ||
3654 | + | ||
3655 | +static void zend_mm_check_leaks(zend_mm_heap_canary *heap TSRMLS_DC) | ||
3656 | +{ | ||
3657 | + zend_mm_segment *segment = heap->segments_list; | ||
3658 | + zend_mm_block_canary *p, *q; | ||
3659 | + zend_uint total = 0; | ||
3660 | + | ||
3661 | + if (!segment) { | ||
3662 | + return; | ||
3663 | + } | ||
3664 | + p = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); | ||
3665 | + while (1) { | ||
3666 | + q = ZEND_MM_NEXT_BLOCK(p); | ||
3667 | + if (q <= p || | ||
3668 | + (char*)q > (char*)segment + segment->size || | ||
3669 | + p->info._size != q->info._prev) { | ||
3670 | + zend_mm_panic("zend_mm_heap corrupted"); | ||
3671 | + } | ||
3672 | + if (!ZEND_MM_IS_FREE_BLOCK(p)) { | ||
3673 | + if (p->magic == MEM_BLOCK_VALID) { | ||
3674 | + long repeated; | ||
3675 | + zend_leak_info leak; | ||
3676 | + | ||
3677 | + ZEND_MM_SET_MAGIC(p, MEM_BLOCK_LEAK); | ||
3678 | + | ||
3679 | + leak.addr = ZEND_MM_DATA_OF(p); | ||
3680 | + leak.size = p->debug.size; | ||
3681 | + leak.filename = p->debug.filename; | ||
3682 | + leak.lineno = p->debug.lineno; | ||
3683 | + leak.orig_filename = p->debug.orig_filename; | ||
3684 | + leak.orig_lineno = p->debug.orig_lineno; | ||
3685 | + | ||
3686 | + zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC); | ||
3687 | + zend_message_dispatcher(ZMSG_MEMORY_LEAK_DETECTED, &leak TSRMLS_CC); | ||
3688 | + repeated = zend_mm_find_leaks(segment, p); | ||
3689 | + total += 1 + repeated; | ||
3690 | + if (repeated) { | ||
3691 | + zend_message_dispatcher(ZMSG_MEMORY_LEAK_REPEATED, (void *)(zend_uintptr_t)repeated TSRMLS_CC); | ||
3692 | + } | ||
3693 | +#if ZEND_MM_CACHE | ||
3694 | + } else if (p->magic == MEM_BLOCK_CACHED) { | ||
3695 | + /* skip it */ | ||
3696 | +#endif | ||
3697 | + } else if (p->magic != MEM_BLOCK_LEAK) { | ||
3698 | + zend_mm_panic("zend_mm_heap corrupted"); | ||
3699 | + } | ||
3700 | + } | ||
3701 | + if (ZEND_MM_IS_GUARD_BLOCK(q)) { | ||
3702 | + segment = segment->next_segment; | ||
3703 | + if (!segment) { | ||
3704 | + break; | ||
3705 | + } | ||
3706 | + q = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); | ||
3707 | + } | ||
3708 | + p = q; | ||
3709 | + } | ||
3710 | + if (total) { | ||
3711 | + zend_message_dispatcher(ZMSG_MEMORY_LEAKS_GRAND_TOTAL, &total TSRMLS_CC); | ||
3712 | + } | ||
3713 | +} | ||
3714 | + | ||
3715 | +static int zend_mm_check_ptr(zend_mm_heap_canary *heap, void *ptr, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
3716 | +{ | ||
3717 | + zend_mm_block_canary *p; | ||
3718 | + int no_cache_notice = 0; | ||
3719 | + int had_problems = 0; | ||
3720 | + int valid_beginning = 1; | ||
3721 | + | ||
3722 | + if (silent==2) { | ||
3723 | + silent = 1; | ||
3724 | + no_cache_notice = 1; | ||
3725 | + } else if (silent==3) { | ||
3726 | + silent = 0; | ||
3727 | + no_cache_notice = 1; | ||
3728 | + } | ||
3729 | + if (!silent) { | ||
3730 | + TSRMLS_FETCH(); | ||
3731 | + | ||
3732 | + zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC); | ||
3733 | + zend_debug_alloc_output("---------------------------------------\n"); | ||
3734 | + zend_debug_alloc_output("%s(%d) : Block "PTR_FMT" status:\n" ZEND_FILE_LINE_RELAY_CC, ptr); | ||
3735 | + if (__zend_orig_filename) { | ||
3736 | + zend_debug_alloc_output("%s(%d) : Actual location (location was relayed)\n" ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3737 | + } | ||
3738 | + if (!ptr) { | ||
3739 | + zend_debug_alloc_output("NULL\n"); | ||
3740 | + zend_debug_alloc_output("---------------------------------------\n"); | ||
3741 | + return 0; | ||
3742 | + } | ||
3743 | + } | ||
3744 | + | ||
3745 | + if (!ptr) { | ||
3746 | + if (silent) { | ||
3747 | + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3748 | + } | ||
3749 | + } | ||
3750 | + | ||
3751 | + p = ZEND_MM_HEADER_OF(ptr); | ||
3752 | + | ||
3753 | +#ifdef ZTS | ||
3754 | + if (ZEND_MM_BAD_THREAD_ID(p)) { | ||
3755 | + if (!silent) { | ||
3756 | + zend_debug_alloc_output("Invalid pointer: ((thread_id=0x%0.8X) != (expected=0x%0.8X))\n", (long)p->thread_id, (long)tsrm_thread_id()); | ||
3757 | + had_problems = 1; | ||
3758 | + } else { | ||
3759 | + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3760 | + } | ||
3761 | + } | ||
3762 | +#endif | ||
3763 | + | ||
3764 | + if (p->info._size != ZEND_MM_NEXT_BLOCK(p)->info._prev) { | ||
3765 | + if (!silent) { | ||
3766 | + zend_debug_alloc_output("Invalid pointer: ((size="PTR_FMT") != (next.prev="PTR_FMT"))\n", p->info._size, ZEND_MM_NEXT_BLOCK(p)->info._prev); | ||
3767 | + had_problems = 1; | ||
3768 | + } else { | ||
3769 | + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3770 | + } | ||
3771 | + } | ||
3772 | + if (p->info._prev != ZEND_MM_GUARD_BLOCK && | ||
3773 | + ZEND_MM_PREV_BLOCK(p)->info._size != p->info._prev) { | ||
3774 | + if (!silent) { | ||
3775 | + zend_debug_alloc_output("Invalid pointer: ((prev="PTR_FMT") != (prev.size="PTR_FMT"))\n", p->info._prev, ZEND_MM_PREV_BLOCK(p)->info._size); | ||
3776 | + had_problems = 1; | ||
3777 | + } else { | ||
3778 | + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3779 | + } | ||
3780 | + } | ||
3781 | + | ||
3782 | + if (had_problems) { | ||
3783 | + zend_debug_alloc_output("---------------------------------------\n"); | ||
3784 | + return 0; | ||
3785 | + } | ||
3786 | + | ||
3787 | + if (!silent) { | ||
3788 | + zend_debug_alloc_output("%10s\t","Beginning: "); | ||
3789 | + } | ||
3790 | + | ||
3791 | + if (!ZEND_MM_IS_USED_BLOCK(p)) { | ||
3792 | + if (!silent) { | ||
3793 | + if (p->magic != MEM_BLOCK_FREED) { | ||
3794 | + zend_debug_alloc_output("Freed (magic=0x%0.8X, expected=0x%0.8X)\n", p->magic, MEM_BLOCK_FREED); | ||
3795 | + } else { | ||
3796 | + zend_debug_alloc_output("Freed\n"); | ||
3797 | + } | ||
3798 | + had_problems = 1; | ||
3799 | + } else { | ||
3800 | + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3801 | + } | ||
3802 | + } else if (ZEND_MM_IS_GUARD_BLOCK(p)) { | ||
3803 | + if (!silent) { | ||
3804 | + if (p->magic != MEM_BLOCK_FREED) { | ||
3805 | + zend_debug_alloc_output("Guard (magic=0x%0.8X, expected=0x%0.8X)\n", p->magic, MEM_BLOCK_FREED); | ||
3806 | + } else { | ||
3807 | + zend_debug_alloc_output("Guard\n"); | ||
3808 | + } | ||
3809 | + had_problems = 1; | ||
3810 | + } else { | ||
3811 | + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3812 | + } | ||
3813 | + } else { | ||
3814 | + switch (p->magic) { | ||
3815 | + case MEM_BLOCK_VALID: | ||
3816 | + case MEM_BLOCK_LEAK: | ||
3817 | + if (!silent) { | ||
3818 | + zend_debug_alloc_output("OK (allocated on %s:%d, %d bytes)\n", p->debug.filename, p->debug.lineno, (int)p->debug.size); | ||
3819 | + } | ||
3820 | + break; /* ok */ | ||
3821 | + case MEM_BLOCK_CACHED: | ||
3822 | + if (!no_cache_notice) { | ||
3823 | + if (!silent) { | ||
3824 | + zend_debug_alloc_output("Cached\n"); | ||
3825 | + had_problems = 1; | ||
3826 | + } else { | ||
3827 | + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3828 | + } | ||
3829 | + } | ||
3830 | + case MEM_BLOCK_FREED: | ||
3831 | + if (!silent) { | ||
3832 | + zend_debug_alloc_output("Freed (invalid)\n"); | ||
3833 | + had_problems = 1; | ||
3834 | + } else { | ||
3835 | + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3836 | + } | ||
3837 | + break; | ||
3838 | + case MEM_BLOCK_GUARD: | ||
3839 | + if (!silent) { | ||
3840 | + zend_debug_alloc_output("Guard (invalid)\n"); | ||
3841 | + had_problems = 1; | ||
3842 | + } else { | ||
3843 | + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3844 | + } | ||
3845 | + break; | ||
3846 | + default: | ||
3847 | + if (!silent) { | ||
3848 | + zend_debug_alloc_output("Unknown (magic=0x%0.8X, expected=0x%0.8X)\n", p->magic, MEM_BLOCK_VALID); | ||
3849 | + had_problems = 1; | ||
3850 | + valid_beginning = 0; | ||
3851 | + } else { | ||
3852 | + return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3853 | + } | ||
3854 | + break; | ||
3855 | + } | ||
3856 | + } | ||
3857 | + | ||
3858 | +#if ZEND_MM_HEAP_PROTECTION | ||
3859 | + if (!valid_beginning) { | ||
3860 | + if (!silent) { | ||
3861 | + zend_debug_alloc_output("%10s\t", "Start:"); | ||
3862 | + zend_debug_alloc_output("Unknown\n"); | ||
3863 | + zend_debug_alloc_output("%10s\t", "End:"); | ||
3864 | + zend_debug_alloc_output("Unknown\n"); | ||
3865 | + } | ||
3866 | + } else { | ||
3867 | + char *end_magic = ZEND_MM_END_MAGIC_PTR(p); | ||
3868 | + | ||
3869 | + if (p->debug.start_magic == _mem_block_start_magic) { | ||
3870 | + if (!silent) { | ||
3871 | + zend_debug_alloc_output("%10s\t", "Start:"); | ||
3872 | + zend_debug_alloc_output("OK\n"); | ||
3873 | + } | ||
3874 | + } else { | ||
3875 | + char *overflow_ptr, *magic_ptr=(char *) &_mem_block_start_magic; | ||
3876 | + int overflows=0; | ||
3877 | + int i; | ||
3878 | + | ||
3879 | + if (silent) { | ||
3880 | + return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3881 | + } | ||
3882 | + had_problems = 1; | ||
3883 | + overflow_ptr = (char *) &p->debug.start_magic; | ||
3884 | + i = END_MAGIC_SIZE; | ||
3885 | + while (--i >= 0) { | ||
3886 | + if (overflow_ptr[i]!=magic_ptr[i]) { | ||
3887 | + overflows++; | ||
3888 | + } | ||
3889 | + } | ||
3890 | + zend_debug_alloc_output("%10s\t", "Start:"); | ||
3891 | + zend_debug_alloc_output("Overflown (magic=0x%0.8X instead of 0x%0.8X)\n", p->debug.start_magic, _mem_block_start_magic); | ||
3892 | + zend_debug_alloc_output("%10s\t",""); | ||
3893 | + if (overflows >= END_MAGIC_SIZE) { | ||
3894 | + zend_debug_alloc_output("At least %d bytes overflown\n", END_MAGIC_SIZE); | ||
3895 | + } else { | ||
3896 | + zend_debug_alloc_output("%d byte(s) overflown\n", overflows); | ||
3897 | + } | ||
3898 | + } | ||
3899 | + if (memcmp(end_magic, &_mem_block_end_magic, END_MAGIC_SIZE)==0) { | ||
3900 | + if (!silent) { | ||
3901 | + zend_debug_alloc_output("%10s\t", "End:"); | ||
3902 | + zend_debug_alloc_output("OK\n"); | ||
3903 | + } | ||
3904 | + } else { | ||
3905 | + char *overflow_ptr, *magic_ptr=(char *) &_mem_block_end_magic; | ||
3906 | + int overflows=0; | ||
3907 | + int i; | ||
3908 | + | ||
3909 | + if (silent) { | ||
3910 | + return _mem_block_check(ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
3911 | + } | ||
3912 | + had_problems = 1; | ||
3913 | + overflow_ptr = (char *) end_magic; | ||
3914 | + | ||
3915 | + for (i=0; i < END_MAGIC_SIZE; i++) { | ||
3916 | + if (overflow_ptr[i]!=magic_ptr[i]) { | ||
3917 | + overflows++; | ||
3918 | + } | ||
3919 | + } | ||
3920 | + | ||
3921 | + zend_debug_alloc_output("%10s\t", "End:"); | ||
3922 | + zend_debug_alloc_output("Overflown (magic=0x%0.8X instead of 0x%0.8X)\n", *end_magic, _mem_block_end_magic); | ||
3923 | + zend_debug_alloc_output("%10s\t",""); | ||
3924 | + if (overflows >= END_MAGIC_SIZE) { | ||
3925 | + zend_debug_alloc_output("At least %d bytes overflown\n", END_MAGIC_SIZE); | ||
3926 | + } else { | ||
3927 | + zend_debug_alloc_output("%d byte(s) overflown\n", overflows); | ||
3928 | + } | ||
3929 | + } | ||
3930 | + } | ||
3931 | +#endif | ||
3932 | + | ||
3933 | + if (!silent) { | ||
3934 | + zend_debug_alloc_output("---------------------------------------\n"); | ||
3935 | + } | ||
3936 | + return ((!had_problems) ? 1 : 0); | ||
3937 | +} | ||
3938 | + | ||
3939 | +static int zend_mm_check_heap(zend_mm_heap_canary *heap, int silent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
3940 | +{ | ||
3941 | + zend_mm_segment *segment = heap->segments_list; | ||
3942 | + zend_mm_block_canary *p, *q; | ||
3943 | + int errors = 0; | ||
3944 | + | ||
3945 | + if (!segment) { | ||
3946 | + return 0; | ||
3947 | + } | ||
3948 | + p = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); | ||
3949 | + while (1) { | ||
3950 | + q = ZEND_MM_NEXT_BLOCK(p); | ||
3951 | + if (q <= p || | ||
3952 | + (char*)q > (char*)segment + segment->size || | ||
3953 | + p->info._size != q->info._prev) { | ||
3954 | + zend_mm_panic("zend_mm_heap corrupted"); | ||
3955 | + } | ||
3956 | + if (!ZEND_MM_IS_FREE_BLOCK(p)) { | ||
3957 | + if (p->magic == MEM_BLOCK_VALID || p->magic == MEM_BLOCK_LEAK) { | ||
3958 | + 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)) { | ||
3959 | + errors++; | ||
3960 | + } | ||
3961 | +#if ZEND_MM_CACHE | ||
3962 | + } else if (p->magic == MEM_BLOCK_CACHED) { | ||
3963 | + /* skip it */ | ||
3964 | +#endif | ||
3965 | + } else if (p->magic != MEM_BLOCK_LEAK) { | ||
3966 | + zend_mm_panic("zend_mm_heap corrupted"); | ||
3967 | + } | ||
3968 | + } | ||
3969 | + if (ZEND_MM_IS_GUARD_BLOCK(q)) { | ||
3970 | + segment = segment->next_segment; | ||
3971 | + if (!segment) { | ||
3972 | + return errors; | ||
3973 | + } | ||
3974 | + q = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); | ||
3975 | + } | ||
3976 | + p = q; | ||
3977 | + } | ||
3978 | +} | ||
3979 | +#endif | ||
3980 | + | ||
3981 | +void __zend_mm_shutdown_canary(zend_mm_heap_canary *heap, int full_shutdown, int silent TSRMLS_DC) | ||
3982 | +{ | ||
3983 | + zend_mm_storage *storage; | ||
3984 | + zend_mm_segment *segment; | ||
3985 | + zend_mm_segment *prev; | ||
3986 | + int internal; | ||
3987 | + | ||
3988 | + if (heap->reserve) { | ||
3989 | +#if ZEND_DEBUG | ||
3990 | + if (!silent) { | ||
3991 | + _zend_mm_free(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
3992 | + } | ||
3993 | +#endif | ||
3994 | + heap->reserve = NULL; | ||
3995 | + } | ||
3996 | + | ||
3997 | +#if ZEND_MM_CACHE_STAT | ||
3998 | + if (full_shutdown) { | ||
3999 | + FILE *f; | ||
4000 | + | ||
4001 | + f = fopen("zend_mm.log", "w"); | ||
4002 | + if (f) { | ||
4003 | + int i,j; | ||
4004 | + size_t size, true_size, min_size, max_size; | ||
4005 | + int hit = 0, miss = 0; | ||
4006 | + | ||
4007 | + fprintf(f, "\nidx min_size max_size true_size max_len hits misses\n"); | ||
4008 | + size = 0; | ||
4009 | + while (1) { | ||
4010 | + true_size = ZEND_MM_TRUE_SIZE(size); | ||
4011 | + if (ZEND_MM_SMALL_SIZE(true_size)) { | ||
4012 | + min_size = size; | ||
4013 | + i = ZEND_MM_BUCKET_INDEX(true_size); | ||
4014 | + size++; | ||
4015 | + while (1) { | ||
4016 | + true_size = ZEND_MM_TRUE_SIZE(size); | ||
4017 | + if (ZEND_MM_SMALL_SIZE(true_size)) { | ||
4018 | + j = ZEND_MM_BUCKET_INDEX(true_size); | ||
4019 | + if (j > i) { | ||
4020 | + max_size = size-1; | ||
4021 | + break; | ||
4022 | + } | ||
4023 | + } else { | ||
4024 | + max_size = size-1; | ||
4025 | + break; | ||
4026 | + } | ||
4027 | + size++; | ||
4028 | + } | ||
4029 | + hit += heap->cache_stat[i].hit; | ||
4030 | + miss += heap->cache_stat[i].miss; | ||
4031 | + 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); | ||
4032 | + } else { | ||
4033 | + break; | ||
4034 | + } | ||
4035 | + } | ||
4036 | + fprintf(f, " %8d %8d\n", hit, miss); | ||
4037 | + fprintf(f, " %8d %8d\n", heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit, heap->cache_stat[ZEND_MM_NUM_BUCKETS].miss); | ||
4038 | + fclose(f); | ||
4039 | + } | ||
4040 | + } | ||
4041 | +#endif | ||
4042 | + | ||
4043 | +#if ZEND_DEBUG | ||
4044 | + if (!silent) { | ||
4045 | + zend_mm_check_leaks(heap TSRMLS_CC); | ||
4046 | + } | ||
4047 | +#endif | ||
4048 | + | ||
4049 | + internal = heap->internal; | ||
4050 | + storage = heap->storage; | ||
4051 | + segment = heap->segments_list; | ||
4052 | + while (segment) { | ||
4053 | + prev = segment; | ||
4054 | + segment = segment->next_segment; | ||
4055 | + ZEND_MM_STORAGE_FREE(prev); | ||
4056 | + } | ||
4057 | + if (full_shutdown) { | ||
4058 | + storage->handlers->dtor(storage); | ||
4059 | + if (!internal) { | ||
4060 | + free(heap); | ||
4061 | + } | ||
4062 | + } else { | ||
4063 | + if (heap->compact_size && | ||
4064 | + heap->real_peak > heap->compact_size) { | ||
4065 | + storage->handlers->compact(storage); | ||
4066 | + } | ||
4067 | + heap->segments_list = NULL; | ||
4068 | + zend_mm_init(heap); | ||
4069 | + heap->real_size = 0; | ||
4070 | + heap->real_peak = 0; | ||
4071 | + heap->size = 0; | ||
4072 | + heap->peak = 0; | ||
4073 | + if (heap->reserve_size) { | ||
4074 | + heap->reserve = _zend_mm_alloc((zend_mm_heap *)heap, heap->reserve_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
4075 | + } | ||
4076 | + heap->overflow = 0; | ||
4077 | + } | ||
4078 | +} | ||
4079 | + | ||
4080 | +static void zend_mm_safe_error(zend_mm_heap_canary *heap, | ||
4081 | + const char *format, | ||
4082 | + size_t limit, | ||
4083 | +#if ZEND_DEBUG | ||
4084 | + const char *filename, | ||
4085 | + uint lineno, | ||
4086 | +#endif | ||
4087 | + size_t size) | ||
4088 | +{ | ||
4089 | + if (heap->reserve) { | ||
4090 | + _zend_mm_free_canary_int(heap, heap->reserve ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC); | ||
4091 | + heap->reserve = NULL; | ||
4092 | + } | ||
4093 | + if (heap->overflow == 0) { | ||
4094 | + char *error_filename; | ||
4095 | + uint error_lineno; | ||
4096 | + TSRMLS_FETCH(); | ||
4097 | + if (zend_is_compiling(TSRMLS_C)) { | ||
4098 | + error_filename = zend_get_compiled_filename(TSRMLS_C); | ||
4099 | + error_lineno = zend_get_compiled_lineno(TSRMLS_C); | ||
4100 | + } else if (EG(in_execution)) { | ||
4101 | + error_filename = EG(active_op_array)?EG(active_op_array)->filename:NULL; | ||
4102 | + error_lineno = EG(opline_ptr)?(*EG(opline_ptr))->lineno:0; | ||
4103 | + } else { | ||
4104 | + error_filename = NULL; | ||
4105 | + error_lineno = 0; | ||
4106 | + } | ||
4107 | + if (!error_filename) { | ||
4108 | + error_filename = "Unknown"; | ||
4109 | + } | ||
4110 | + heap->overflow = 1; | ||
4111 | + zend_try { | ||
4112 | + zend_error_noreturn(E_ERROR, | ||
4113 | + format, | ||
4114 | + limit, | ||
4115 | +#if ZEND_DEBUG | ||
4116 | + filename, | ||
4117 | + lineno, | ||
4118 | +#endif | ||
4119 | + size); | ||
4120 | + } zend_catch { | ||
4121 | + if (heap->overflow == 2) { | ||
4122 | + fprintf(stderr, "\nFatal error: "); | ||
4123 | + fprintf(stderr, | ||
4124 | + format, | ||
4125 | + limit, | ||
4126 | +#if ZEND_DEBUG | ||
4127 | + filename, | ||
4128 | + lineno, | ||
4129 | +#endif | ||
4130 | + size); | ||
4131 | + fprintf(stderr, " in %s on line %d\n", error_filename, error_lineno); | ||
4132 | + } | ||
4133 | +/* See http://support.microsoft.com/kb/190351 */ | ||
4134 | +#ifdef PHP_WIN32 | ||
4135 | + fflush(stderr); | ||
4136 | +#endif | ||
4137 | + } zend_end_try(); | ||
4138 | + } else { | ||
4139 | + heap->overflow = 2; | ||
4140 | + } | ||
4141 | + zend_bailout(); | ||
4142 | +} | ||
4143 | + | ||
4144 | +static zend_mm_free_block_canary *zend_mm_search_large_block(zend_mm_heap_canary *heap, size_t true_size) | ||
4145 | +{ | ||
4146 | + zend_mm_free_block_canary *best_fit; | ||
4147 | + size_t index = ZEND_MM_LARGE_BUCKET_INDEX(true_size); | ||
4148 | + size_t bitmap = heap->large_free_bitmap >> index; | ||
4149 | + zend_mm_free_block_canary *p; | ||
4150 | + | ||
4151 | + if (bitmap == 0) { | ||
4152 | + return NULL; | ||
4153 | + } | ||
4154 | + | ||
4155 | + if (UNEXPECTED((bitmap & 1) != 0)) { | ||
4156 | + /* Search for best "large" free block */ | ||
4157 | + zend_mm_free_block_canary *rst = NULL; | ||
4158 | + size_t m; | ||
4159 | + size_t best_size = -1; | ||
4160 | + | ||
4161 | + best_fit = NULL; | ||
4162 | + p = heap->large_free_buckets[index]; | ||
4163 | + for (m = true_size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) { | ||
4164 | + if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) { | ||
4165 | + return SUHOSIN_MANGLE_PTR(p->next_free_block); | ||
4166 | + } else if (ZEND_MM_FREE_BLOCK_SIZE(p) >= true_size && | ||
4167 | + ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) { | ||
4168 | + best_size = ZEND_MM_FREE_BLOCK_SIZE(p); | ||
4169 | + best_fit = p; | ||
4170 | + } | ||
4171 | + if ((m & (ZEND_MM_LONG_CONST(1) << (ZEND_MM_NUM_BUCKETS-1))) == 0) { | ||
4172 | + if (p->child[1]) { | ||
4173 | + rst = p->child[1]; | ||
4174 | + } | ||
4175 | + if (p->child[0]) { | ||
4176 | + p = p->child[0]; | ||
4177 | + } else { | ||
4178 | + break; | ||
4179 | + } | ||
4180 | + } else if (p->child[1]) { | ||
4181 | + p = p->child[1]; | ||
4182 | + } else { | ||
4183 | + break; | ||
4184 | + } | ||
4185 | + } | ||
4186 | + | ||
4187 | + for (p = rst; p; p = p->child[p->child[0] != NULL]) { | ||
4188 | + if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) { | ||
4189 | + return SUHOSIN_MANGLE_PTR(p->next_free_block); | ||
4190 | + } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size && | ||
4191 | + ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) { | ||
4192 | + best_size = ZEND_MM_FREE_BLOCK_SIZE(p); | ||
4193 | + best_fit = p; | ||
4194 | + } | ||
4195 | + } | ||
4196 | + | ||
4197 | + if (best_fit) { | ||
4198 | + return SUHOSIN_MANGLE_PTR(best_fit->next_free_block); | ||
4199 | + } | ||
4200 | + bitmap = bitmap >> 1; | ||
4201 | + if (!bitmap) { | ||
4202 | + return NULL; | ||
4203 | + } | ||
4204 | + index++; | ||
4205 | + } | ||
4206 | + | ||
4207 | + /* Search for smallest "large" free block */ | ||
4208 | + best_fit = p = heap->large_free_buckets[index + zend_mm_low_bit(bitmap)]; | ||
4209 | + while ((p = p->child[p->child[0] != NULL])) { | ||
4210 | + if (ZEND_MM_FREE_BLOCK_SIZE(p) < ZEND_MM_FREE_BLOCK_SIZE(best_fit)) { | ||
4211 | + best_fit = p; | ||
4212 | + } | ||
4213 | + } | ||
4214 | + return SUHOSIN_MANGLE_PTR(best_fit->next_free_block); | ||
4215 | +} | ||
4216 | + | ||
4217 | +void *_zend_mm_alloc_canary_int(zend_mm_heap_canary *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
4218 | +{ | ||
4219 | + zend_mm_free_block_canary *best_fit; | ||
4220 | + size_t true_size = ZEND_MM_TRUE_SIZE(size); | ||
4221 | + size_t block_size; | ||
4222 | + size_t remaining_size; | ||
4223 | + size_t segment_size; | ||
4224 | + zend_mm_segment *segment; | ||
4225 | + int keep_rest = 0; | ||
4226 | + | ||
4227 | + if (EXPECTED(ZEND_MM_SMALL_SIZE(true_size))) { | ||
4228 | + size_t index = ZEND_MM_BUCKET_INDEX(true_size); | ||
4229 | + size_t bitmap; | ||
4230 | + | ||
4231 | + if (UNEXPECTED(true_size < size)) { | ||
4232 | + goto out_of_memory; | ||
4233 | + } | ||
4234 | +#if ZEND_MM_CACHE | ||
4235 | + if (EXPECTED(heap->cache[index] != NULL)) { | ||
4236 | + /* Get block from cache */ | ||
4237 | +#if ZEND_MM_CACHE_STAT | ||
4238 | + heap->cache_stat[index].count--; | ||
4239 | + heap->cache_stat[index].hit++; | ||
4240 | +#endif | ||
4241 | + best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]); | ||
4242 | + heap->cache[index] = best_fit->prev_free_block; | ||
4243 | + heap->cached -= true_size; | ||
4244 | +#if SUHOSIN_PATCH | ||
4245 | + SUHOSIN_MM_SET_CANARIES(best_fit); | ||
4246 | + ((zend_mm_block_canary*)best_fit)->info.size = size; | ||
4247 | + SUHOSIN_MM_SET_END_CANARY(best_fit); | ||
4248 | +#endif | ||
4249 | + ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED); | ||
4250 | + ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0); | ||
4251 | + return ZEND_MM_DATA_OF(best_fit); | ||
4252 | + } | ||
4253 | +#if ZEND_MM_CACHE_STAT | ||
4254 | + heap->cache_stat[index].miss++; | ||
4255 | +#endif | ||
4256 | +#endif | ||
4257 | + | ||
4258 | + bitmap = heap->free_bitmap >> index; | ||
4259 | + if (bitmap) { | ||
4260 | + /* Found some "small" free block that can be used */ | ||
4261 | + index += zend_mm_low_bit(bitmap); | ||
4262 | + best_fit = SUHOSIN_MANGLE_PTR(heap->free_buckets[index*2]); | ||
4263 | +#if ZEND_MM_CACHE_STAT | ||
4264 | + heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit++; | ||
4265 | +#endif | ||
4266 | + goto zend_mm_finished_searching_for_block; | ||
4267 | + } | ||
4268 | + } | ||
4269 | + | ||
4270 | +#if ZEND_MM_CACHE_STAT | ||
4271 | + heap->cache_stat[ZEND_MM_NUM_BUCKETS].miss++; | ||
4272 | +#endif | ||
4273 | + | ||
4274 | + best_fit = zend_mm_search_large_block(heap, true_size); | ||
4275 | + | ||
4276 | + if (!best_fit && heap->real_size >= heap->limit - heap->block_size) { | ||
4277 | + zend_mm_free_block_canary *p = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]); | ||
4278 | + size_t best_size = -1; | ||
4279 | + | ||
4280 | + while (p != ZEND_MM_REST_BUCKET(heap)) { | ||
4281 | + if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) { | ||
4282 | + best_fit = p; | ||
4283 | + goto zend_mm_finished_searching_for_block; | ||
4284 | + } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size && | ||
4285 | + ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) { | ||
4286 | + best_size = ZEND_MM_FREE_BLOCK_SIZE(p); | ||
4287 | + best_fit = p; | ||
4288 | + } | ||
4289 | + p = SUHOSIN_MANGLE_PTR(p->prev_free_block); | ||
4290 | + } | ||
4291 | + } | ||
4292 | + | ||
4293 | + if (!best_fit) { | ||
4294 | + if (true_size > heap->block_size - (ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE)) { | ||
4295 | + /* Make sure we add a memory block which is big enough, | ||
4296 | + segment must have header "size" and trailer "guard" block */ | ||
4297 | + segment_size = true_size + ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE; | ||
4298 | + segment_size = (segment_size + (heap->block_size-1)) & ~(heap->block_size-1); | ||
4299 | + keep_rest = 1; | ||
4300 | + } else { | ||
4301 | + segment_size = heap->block_size; | ||
4302 | + } | ||
4303 | + | ||
4304 | + HANDLE_BLOCK_INTERRUPTIONS(); | ||
4305 | + | ||
4306 | + if (segment_size < true_size || | ||
4307 | + heap->real_size + segment_size > heap->limit) { | ||
4308 | + /* Memory limit overflow */ | ||
4309 | +#if ZEND_MM_CACHE | ||
4310 | + zend_mm_free_cache(heap); | ||
4311 | +#endif | ||
4312 | + HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
4313 | +#if ZEND_DEBUG | ||
4314 | + 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); | ||
4315 | +#else | ||
4316 | + zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted (tried to allocate %lu bytes)", heap->limit, size); | ||
4317 | +#endif | ||
4318 | + } | ||
4319 | + | ||
4320 | + segment = (zend_mm_segment *) ZEND_MM_STORAGE_ALLOC(segment_size); | ||
4321 | + | ||
4322 | + if (!segment) { | ||
4323 | + /* Storage manager cannot allocate memory */ | ||
4324 | +#if ZEND_MM_CACHE | ||
4325 | + zend_mm_free_cache(heap); | ||
4326 | +#endif | ||
4327 | + HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
4328 | +out_of_memory: | ||
4329 | +#if ZEND_DEBUG | ||
4330 | + 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); | ||
4331 | +#else | ||
4332 | + zend_mm_safe_error(heap, "Out of memory (allocated %ld) (tried to allocate %lu bytes)", heap->real_size, size); | ||
4333 | +#endif | ||
4334 | + return NULL; | ||
4335 | + } | ||
4336 | + | ||
4337 | + heap->real_size += segment_size; | ||
4338 | + if (heap->real_size > heap->real_peak) { | ||
4339 | + heap->real_peak = heap->real_size; | ||
4340 | + } | ||
4341 | + | ||
4342 | + segment->size = segment_size; | ||
4343 | + segment->next_segment = heap->segments_list; | ||
4344 | + heap->segments_list = segment; | ||
4345 | + | ||
4346 | + best_fit = (zend_mm_free_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); | ||
4347 | + ZEND_MM_MARK_FIRST_BLOCK(best_fit); | ||
4348 | + | ||
4349 | + block_size = segment_size - ZEND_MM_ALIGNED_SEGMENT_SIZE - ZEND_MM_ALIGNED_HEADER_SIZE; | ||
4350 | + | ||
4351 | + ZEND_MM_LAST_BLOCK(ZEND_MM_BLOCK_AT(best_fit, block_size)); | ||
4352 | + | ||
4353 | + } else { | ||
4354 | +zend_mm_finished_searching_for_block: | ||
4355 | + /* remove from free list */ | ||
4356 | + HANDLE_BLOCK_INTERRUPTIONS(); | ||
4357 | + ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_FREED); | ||
4358 | + ZEND_MM_CHECK_COOKIE(best_fit); | ||
4359 | + ZEND_MM_CHECK_BLOCK_LINKAGE(best_fit); | ||
4360 | + zend_mm_remove_from_free_list(heap, best_fit); | ||
4361 | + | ||
4362 | + block_size = ZEND_MM_FREE_BLOCK_SIZE(best_fit); | ||
4363 | + } | ||
4364 | + | ||
4365 | + remaining_size = block_size - true_size; | ||
4366 | + | ||
4367 | + if (remaining_size < ZEND_MM_ALIGNED_MIN_HEADER_SIZE) { | ||
4368 | + true_size = block_size; | ||
4369 | + ZEND_MM_BLOCK(best_fit, ZEND_MM_USED_BLOCK, true_size); | ||
4370 | + } else { | ||
4371 | + zend_mm_free_block_canary *new_free_block; | ||
4372 | + | ||
4373 | + /* prepare new free block */ | ||
4374 | + ZEND_MM_BLOCK(best_fit, ZEND_MM_USED_BLOCK, true_size); | ||
4375 | + new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(best_fit, true_size); | ||
4376 | + ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size); | ||
4377 | + | ||
4378 | + /* add the new free block to the free list */ | ||
4379 | + if (EXPECTED(!keep_rest)) { | ||
4380 | + zend_mm_add_to_free_list(heap, new_free_block); | ||
4381 | + } else { | ||
4382 | + zend_mm_add_to_rest_list(heap, new_free_block); | ||
4383 | + } | ||
4384 | + } | ||
4385 | + | ||
4386 | + ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1); | ||
4387 | + | ||
4388 | +#if SUHOSIN_PATCH | ||
4389 | + SUHOSIN_MM_SET_CANARIES(best_fit); | ||
4390 | + ((zend_mm_block_canary*)best_fit)->info.size = size; | ||
4391 | + SUHOSIN_MM_SET_END_CANARY(best_fit); | ||
4392 | +#endif | ||
4393 | + | ||
4394 | + heap->size += true_size; | ||
4395 | + if (heap->peak < heap->size) { | ||
4396 | + heap->peak = heap->size; | ||
4397 | + } | ||
4398 | + | ||
4399 | + HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
4400 | + return ZEND_MM_DATA_OF(best_fit); | ||
4401 | +} | ||
4402 | + | ||
4403 | + | ||
4404 | +void _zend_mm_free_canary_int(zend_mm_heap_canary *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) | ||
4405 | +{ | ||
4406 | + zend_mm_block_canary *mm_block; | ||
4407 | + zend_mm_block_canary *next_block; | ||
4408 | + size_t size; | ||
4409 | + | ||
4410 | + if (!ZEND_MM_VALID_PTR(p)) { | ||
4411 | + return; | ||
4412 | + } | ||
4413 | + | ||
4414 | + mm_block = ZEND_MM_HEADER_OF(p); | ||
4415 | + size = ZEND_MM_BLOCK_SIZE(mm_block); | ||
4416 | +#if SUHOSIN_PATCH | ||
4417 | + SUHOSIN_MM_CHECK_CANARIES(mm_block, "efree()"); | ||
4418 | +#endif | ||
4419 | + ZEND_MM_CHECK_PROTECTION(mm_block); | ||
4420 | + | ||
4421 | +#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION | ||
4422 | + memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->debug.size); | ||
4423 | +#endif | ||
4424 | +#if SUHOSIN_PATCH | ||
4425 | + if (UNEXPECTED(SUHOSIN_CONFIG(SUHOSIN_MM_DESTROY_FREE_MEMORY))) { | ||
4426 | + memset(ZEND_MM_DATA_OF(mm_block), 0x5a, mm_block->info.size); | ||
4427 | + } | ||
4428 | +#endif | ||
4429 | +#if ZEND_MM_CACHE | ||
4430 | + if (EXPECTED(ZEND_MM_SMALL_SIZE(size)) && EXPECTED(heap->cached < ZEND_MM_CACHE_SIZE)) { | ||
4431 | + size_t index = ZEND_MM_BUCKET_INDEX(size); | ||
4432 | + zend_mm_free_block_canary **cache = &heap->cache[index]; | ||
4433 | + | ||
4434 | + ((zend_mm_free_block_canary*)mm_block)->prev_free_block = *cache; | ||
4435 | + *cache = (zend_mm_free_block_canary*)SUHOSIN_MANGLE_PTR(mm_block); | ||
4436 | + heap->cached += size; | ||
4437 | + ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED); | ||
4438 | +#if ZEND_MM_CACHE_STAT | ||
4439 | + if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) { | ||
4440 | + heap->cache_stat[index].max_count = heap->cache_stat[index].count; | ||
4441 | + } | ||
4442 | +#endif | ||
4443 | + return; | ||
4444 | + } | ||
4445 | +#endif | ||
4446 | + | ||
4447 | + HANDLE_BLOCK_INTERRUPTIONS(); | ||
4448 | + | ||
4449 | + heap->size -= size; | ||
4450 | + | ||
4451 | + next_block = ZEND_MM_BLOCK_AT(mm_block, size); | ||
4452 | + if (ZEND_MM_IS_FREE_BLOCK(next_block)) { | ||
4453 | + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block); | ||
4454 | + size += ZEND_MM_FREE_BLOCK_SIZE(next_block); | ||
4455 | + } | ||
4456 | + if (ZEND_MM_PREV_BLOCK_IS_FREE(mm_block)) { | ||
4457 | + mm_block = ZEND_MM_PREV_BLOCK(mm_block); | ||
4458 | + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) mm_block); | ||
4459 | + size += ZEND_MM_FREE_BLOCK_SIZE(mm_block); | ||
4460 | + } | ||
4461 | + if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && | ||
4462 | + ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(mm_block, size))) { | ||
4463 | + zend_mm_del_segment(heap, (zend_mm_segment *) ((char *)mm_block - ZEND_MM_ALIGNED_SEGMENT_SIZE)); | ||
4464 | + } else { | ||
4465 | + ZEND_MM_BLOCK(mm_block, ZEND_MM_FREE_BLOCK, size); | ||
4466 | + zend_mm_add_to_free_list(heap, (zend_mm_free_block_canary *) mm_block); | ||
4467 | + } | ||
4468 | + HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
4469 | +} | ||
4470 | + | ||
4471 | +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) | ||
4472 | +{ | ||
4473 | + zend_mm_block_canary *mm_block = ZEND_MM_HEADER_OF(p); | ||
4474 | + zend_mm_block_canary *next_block; | ||
4475 | + size_t true_size; | ||
4476 | + size_t orig_size; | ||
4477 | + void *ptr; | ||
4478 | + | ||
4479 | + if (UNEXPECTED(!p) || !ZEND_MM_VALID_PTR(p)) { | ||
4480 | + return _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
4481 | + } | ||
4482 | + mm_block = ZEND_MM_HEADER_OF(p); | ||
4483 | + true_size = ZEND_MM_TRUE_SIZE(size); | ||
4484 | + orig_size = ZEND_MM_BLOCK_SIZE(mm_block); | ||
4485 | +#if SUHOSIN_PATCH | ||
4486 | + SUHOSIN_MM_CHECK_CANARIES(mm_block, "erealloc()"); | ||
4487 | +#endif | ||
4488 | + ZEND_MM_CHECK_PROTECTION(mm_block); | ||
4489 | + | ||
4490 | + if (UNEXPECTED(true_size < size)) { | ||
4491 | + goto out_of_memory; | ||
4492 | + } | ||
4493 | + | ||
4494 | + if (true_size <= orig_size) { | ||
4495 | + size_t remaining_size = orig_size - true_size; | ||
4496 | + | ||
4497 | + if (remaining_size >= ZEND_MM_ALIGNED_MIN_HEADER_SIZE) { | ||
4498 | + zend_mm_free_block_canary *new_free_block; | ||
4499 | + | ||
4500 | + HANDLE_BLOCK_INTERRUPTIONS(); | ||
4501 | + next_block = ZEND_MM_BLOCK_AT(mm_block, orig_size); | ||
4502 | + if (ZEND_MM_IS_FREE_BLOCK(next_block)) { | ||
4503 | + remaining_size += ZEND_MM_FREE_BLOCK_SIZE(next_block); | ||
4504 | + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block); | ||
4505 | + } | ||
4506 | + | ||
4507 | + /* prepare new free block */ | ||
4508 | + ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size); | ||
4509 | + new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(mm_block, true_size); | ||
4510 | + | ||
4511 | + ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size); | ||
4512 | + | ||
4513 | + /* add the new free block to the free list */ | ||
4514 | + zend_mm_add_to_free_list(heap, new_free_block); | ||
4515 | + heap->size += (true_size - orig_size); | ||
4516 | + HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
4517 | + } | ||
4518 | + ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0); | ||
4519 | +#if SUHOSIN_PATCH | ||
4520 | + SUHOSIN_MM_SET_CANARIES(mm_block); | ||
4521 | + ((zend_mm_block_canary*)mm_block)->info.size = size; | ||
4522 | + SUHOSIN_MM_SET_END_CANARY(mm_block); | ||
4523 | +#endif | ||
4524 | + return p; | ||
4525 | + } | ||
4526 | + | ||
4527 | +#if ZEND_MM_CACHE | ||
4528 | + if (ZEND_MM_SMALL_SIZE(true_size)) { | ||
4529 | + size_t index = ZEND_MM_BUCKET_INDEX(true_size); | ||
4530 | + | ||
4531 | + if (heap->cache[index] != NULL) { | ||
4532 | + zend_mm_free_block_canary *best_fit; | ||
4533 | + zend_mm_free_block_canary **cache; | ||
4534 | + | ||
4535 | +#if ZEND_MM_CACHE_STAT | ||
4536 | + heap->cache_stat[index].count--; | ||
4537 | + heap->cache_stat[index].hit++; | ||
4538 | +#endif | ||
4539 | + best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]); | ||
4540 | + heap->cache[index] = best_fit->prev_free_block; | ||
4541 | + ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED); | ||
4542 | + ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0); | ||
4543 | +#if SUHOSIN_PATCH | ||
4544 | + SUHOSIN_MM_SET_CANARIES(best_fit); | ||
4545 | + ((zend_mm_block_canary*)best_fit)->info.size = size; | ||
4546 | + SUHOSIN_MM_SET_END_CANARY(best_fit); | ||
4547 | +#endif | ||
4548 | + | ||
4549 | + ptr = ZEND_MM_DATA_OF(best_fit); | ||
4550 | + | ||
4551 | +#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION | ||
4552 | + memcpy(ptr, p, mm_block->debug.size); | ||
4553 | +#else | ||
4554 | + memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE); | ||
4555 | +#endif | ||
4556 | + | ||
4557 | + heap->cached -= true_size - orig_size; | ||
4558 | + | ||
4559 | + index = ZEND_MM_BUCKET_INDEX(orig_size); | ||
4560 | + cache = &heap->cache[index]; | ||
4561 | + | ||
4562 | + ((zend_mm_free_block_canary*)mm_block)->prev_free_block = *cache; | ||
4563 | + *cache = (zend_mm_free_block_canary*)SUHOSIN_MANGLE_PTR(mm_block); | ||
4564 | + ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED); | ||
4565 | +#if ZEND_MM_CACHE_STAT | ||
4566 | + if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) { | ||
4567 | + heap->cache_stat[index].max_count = heap->cache_stat[index].count; | ||
4568 | + } | ||
4569 | +#endif | ||
4570 | + return ptr; | ||
4571 | + } | ||
4572 | + } | ||
4573 | +#endif | ||
4574 | + | ||
4575 | + next_block = ZEND_MM_BLOCK_AT(mm_block, orig_size); | ||
4576 | + | ||
4577 | + if (ZEND_MM_IS_FREE_BLOCK(next_block)) { | ||
4578 | + ZEND_MM_CHECK_COOKIE(next_block); | ||
4579 | + ZEND_MM_CHECK_BLOCK_LINKAGE(next_block); | ||
4580 | + if (orig_size + ZEND_MM_FREE_BLOCK_SIZE(next_block) >= true_size) { | ||
4581 | + size_t block_size = orig_size + ZEND_MM_FREE_BLOCK_SIZE(next_block); | ||
4582 | + size_t remaining_size = block_size - true_size; | ||
4583 | + | ||
4584 | + HANDLE_BLOCK_INTERRUPTIONS(); | ||
4585 | + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block); | ||
4586 | + | ||
4587 | + if (remaining_size < ZEND_MM_ALIGNED_MIN_HEADER_SIZE) { | ||
4588 | + true_size = block_size; | ||
4589 | + ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size); | ||
4590 | + } else { | ||
4591 | + zend_mm_free_block_canary *new_free_block; | ||
4592 | + | ||
4593 | + /* prepare new free block */ | ||
4594 | + ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size); | ||
4595 | + new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(mm_block, true_size); | ||
4596 | + ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size); | ||
4597 | + | ||
4598 | + /* add the new free block to the free list */ | ||
4599 | + if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && | ||
4600 | + ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(new_free_block, remaining_size))) { | ||
4601 | + zend_mm_add_to_rest_list(heap, new_free_block); | ||
4602 | + } else { | ||
4603 | + zend_mm_add_to_free_list(heap, new_free_block); | ||
4604 | + } | ||
4605 | + } | ||
4606 | + ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0); | ||
4607 | + heap->size = heap->size + true_size - orig_size; | ||
4608 | + if (heap->peak < heap->size) { | ||
4609 | + heap->peak = heap->size; | ||
4610 | + } | ||
4611 | + HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
4612 | +#if SUHOSIN_PATCH | ||
4613 | + SUHOSIN_MM_SET_CANARIES(mm_block); | ||
4614 | + ((zend_mm_block_canary*)mm_block)->info.size = size; | ||
4615 | + SUHOSIN_MM_SET_END_CANARY(mm_block); | ||
4616 | +#endif | ||
4617 | + return p; | ||
4618 | + } else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && | ||
4619 | + ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(next_block, ZEND_MM_FREE_BLOCK_SIZE(next_block)))) { | ||
4620 | + HANDLE_BLOCK_INTERRUPTIONS(); | ||
4621 | + zend_mm_remove_from_free_list(heap, (zend_mm_free_block_canary *) next_block); | ||
4622 | + goto realloc_segment; | ||
4623 | + } | ||
4624 | + } else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) && ZEND_MM_IS_GUARD_BLOCK(next_block)) { | ||
4625 | + zend_mm_segment *segment; | ||
4626 | + zend_mm_segment *segment_copy; | ||
4627 | + size_t segment_size; | ||
4628 | + size_t block_size; | ||
4629 | + size_t remaining_size; | ||
4630 | + | ||
4631 | + HANDLE_BLOCK_INTERRUPTIONS(); | ||
4632 | +realloc_segment: | ||
4633 | + /* segment size, size of block and size of guard block */ | ||
4634 | + if (true_size > heap->block_size - (ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE)) { | ||
4635 | + segment_size = true_size+ZEND_MM_ALIGNED_SEGMENT_SIZE+ZEND_MM_ALIGNED_HEADER_SIZE; | ||
4636 | + segment_size = (segment_size + (heap->block_size-1)) & ~(heap->block_size-1); | ||
4637 | + } else { | ||
4638 | + segment_size = heap->block_size; | ||
4639 | + } | ||
4640 | + | ||
4641 | + segment_copy = (zend_mm_segment *) ((char *)mm_block - ZEND_MM_ALIGNED_SEGMENT_SIZE); | ||
4642 | + if (segment_size < true_size || | ||
4643 | + heap->real_size + segment_size - segment_copy->size > heap->limit) { | ||
4644 | + if (ZEND_MM_IS_FREE_BLOCK(next_block)) { | ||
4645 | + zend_mm_add_to_free_list(heap, (zend_mm_free_block_canary *) next_block); | ||
4646 | + } | ||
4647 | +#if ZEND_MM_CACHE | ||
4648 | + zend_mm_free_cache(heap); | ||
4649 | +#endif | ||
4650 | + HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
4651 | +#if ZEND_DEBUG | ||
4652 | + 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); | ||
4653 | +#else | ||
4654 | + zend_mm_safe_error(heap, "Allowed memory size of %ld bytes exhausted (tried to allocate %ld bytes)", heap->limit, size); | ||
4655 | +#endif | ||
4656 | + return NULL; | ||
4657 | + } | ||
4658 | + | ||
4659 | + segment = ZEND_MM_STORAGE_REALLOC(segment_copy, segment_size); | ||
4660 | + if (!segment) { | ||
4661 | +#if ZEND_MM_CACHE | ||
4662 | + zend_mm_free_cache(heap); | ||
4663 | +#endif | ||
4664 | + HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
4665 | +out_of_memory: | ||
4666 | +#if ZEND_DEBUG | ||
4667 | + 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); | ||
4668 | +#else | ||
4669 | + zend_mm_safe_error(heap, "Out of memory (allocated %ld) (tried to allocate %ld bytes)", heap->real_size, size); | ||
4670 | +#endif | ||
4671 | + return NULL; | ||
4672 | + } | ||
4673 | + heap->real_size += segment_size - segment->size; | ||
4674 | + if (heap->real_size > heap->real_peak) { | ||
4675 | + heap->real_peak = heap->real_size; | ||
4676 | + } | ||
4677 | + | ||
4678 | + segment->size = segment_size; | ||
4679 | + | ||
4680 | + if (segment != segment_copy) { | ||
4681 | + zend_mm_segment **seg = &heap->segments_list; | ||
4682 | + while (*seg != segment_copy) { | ||
4683 | + seg = &(*seg)->next_segment; | ||
4684 | + } | ||
4685 | + *seg = segment; | ||
4686 | + mm_block = (zend_mm_block_canary *) ((char *) segment + ZEND_MM_ALIGNED_SEGMENT_SIZE); | ||
4687 | + ZEND_MM_MARK_FIRST_BLOCK(mm_block); | ||
4688 | + } | ||
4689 | + | ||
4690 | + block_size = segment_size - ZEND_MM_ALIGNED_SEGMENT_SIZE - ZEND_MM_ALIGNED_HEADER_SIZE; | ||
4691 | + remaining_size = block_size - true_size; | ||
4692 | + | ||
4693 | + /* setup guard block */ | ||
4694 | + ZEND_MM_LAST_BLOCK(ZEND_MM_BLOCK_AT(mm_block, block_size)); | ||
4695 | + | ||
4696 | + if (remaining_size < ZEND_MM_ALIGNED_MIN_HEADER_SIZE) { | ||
4697 | + true_size = block_size; | ||
4698 | + ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size); | ||
4699 | + } else { | ||
4700 | + zend_mm_free_block_canary *new_free_block; | ||
4701 | + | ||
4702 | + /* prepare new free block */ | ||
4703 | + ZEND_MM_BLOCK(mm_block, ZEND_MM_USED_BLOCK, true_size); | ||
4704 | + new_free_block = (zend_mm_free_block_canary *) ZEND_MM_BLOCK_AT(mm_block, true_size); | ||
4705 | + ZEND_MM_BLOCK(new_free_block, ZEND_MM_FREE_BLOCK, remaining_size); | ||
4706 | + | ||
4707 | + /* add the new free block to the free list */ | ||
4708 | + zend_mm_add_to_rest_list(heap, new_free_block); | ||
4709 | + } | ||
4710 | + | ||
4711 | + ZEND_MM_SET_DEBUG_INFO(mm_block, size, 1, 1); | ||
4712 | + | ||
4713 | + heap->size = heap->size + true_size - orig_size; | ||
4714 | + if (heap->peak < heap->size) { | ||
4715 | + heap->peak = heap->size; | ||
4716 | + } | ||
4717 | + | ||
4718 | + HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
4719 | +#if SUHOSIN_PATCH | ||
4720 | + SUHOSIN_MM_SET_CANARIES(mm_block); | ||
4721 | + ((zend_mm_block_canary*)mm_block)->info.size = size; | ||
4722 | + SUHOSIN_MM_SET_END_CANARY(mm_block); | ||
4723 | +#endif | ||
4724 | + return ZEND_MM_DATA_OF(mm_block); | ||
4725 | + } | ||
4726 | + | ||
4727 | + ptr = _zend_mm_alloc_canary_int(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
4728 | +#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION | ||
4729 | + memcpy(ptr, p, mm_block->debug.size); | ||
4730 | +#else | ||
4731 | + memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE); | ||
4732 | +#endif | ||
4733 | + _zend_mm_free_canary_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); | ||
4734 | + return ptr; | ||
4735 | +} | ||
4736 | + | ||
4737 | +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) | ||
4738 | +{ | ||
4739 | + zend_mm_block_canary *mm_block; | ||
4740 | + | ||
4741 | + if (!ZEND_MM_VALID_PTR(p)) { | ||
4742 | + return 0; | ||
4743 | + } | ||
4744 | + mm_block = ZEND_MM_HEADER_OF(p); | ||
4745 | + ZEND_MM_CHECK_PROTECTION(mm_block); | ||
4746 | +#if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION | ||
4747 | + return mm_block->debug.size; | ||
4748 | +#else | ||
4749 | + return ZEND_MM_BLOCK_SIZE(mm_block); | ||
4750 | +#endif | ||
4751 | +} | ||
4752 | + | ||
4753 | +#if defined(__GNUC__) && defined(i386) | ||
4754 | + | ||
4755 | +static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) | ||
4756 | +{ | ||
4757 | + size_t res = nmemb; | ||
4758 | + unsigned long overflow = 0; | ||
4759 | + | ||
4760 | + __asm__ ("mull %3\n\taddl %4,%0\n\tadcl %1,%1" | ||
4761 | + : "=&a"(res), "=&d" (overflow) | ||
4762 | + : "%0"(res), | ||
4763 | + "rm"(size), | ||
4764 | + "rm"(offset)); | ||
4765 | + | ||
4766 | + if (UNEXPECTED(overflow)) { | ||
4767 | + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); | ||
4768 | + return 0; | ||
4769 | + } | ||
4770 | + return res; | ||
4771 | +} | ||
4772 | + | ||
4773 | +#elif defined(__GNUC__) && defined(__x86_64__) | ||
4774 | + | ||
4775 | +static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) | ||
4776 | +{ | ||
4777 | + size_t res = nmemb; | ||
4778 | + unsigned long overflow = 0; | ||
4779 | + | ||
4780 | + __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1" | ||
4781 | + : "=&a"(res), "=&d" (overflow) | ||
4782 | + : "%0"(res), | ||
4783 | + "rm"(size), | ||
4784 | + "rm"(offset)); | ||
4785 | + | ||
4786 | + if (UNEXPECTED(overflow)) { | ||
4787 | + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); | ||
4788 | + return 0; | ||
4789 | + } | ||
4790 | + return res; | ||
4791 | +} | ||
4792 | + | ||
4793 | +#elif SIZEOF_SIZE_T == 4 && defined(HAVE_ZEND_LONG64) | ||
4794 | + | ||
4795 | +static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) | ||
4796 | +{ | ||
4797 | + zend_ulong64 res = (zend_ulong64)nmemb * (zend_ulong64)size + (zend_ulong64)offset; | ||
4798 | + | ||
4799 | + if (UNEXPECTED(res > (zend_ulong64)0xFFFFFFFFL)) { | ||
4800 | + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); | ||
4801 | + return 0; | ||
4802 | + } | ||
4803 | + return (size_t) res; | ||
4804 | +} | ||
4805 | + | ||
4806 | +#else | ||
4807 | + | ||
4808 | +static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) | ||
4809 | +{ | ||
4810 | + size_t res = nmemb * size + offset; | ||
4811 | + double _d = (double)nmemb * (double)size + (double)offset; | ||
4812 | + double _delta = (double)res - _d; | ||
4813 | + | ||
4814 | + if (UNEXPECTED((_d + _delta ) != _d)) { | ||
4815 | + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); | ||
4816 | + return 0; | ||
4817 | + } | ||
4818 | + return res; | ||
4819 | +} | ||
4820 | +#endif | ||
4821 | + | ||
4822 | +/* | ||
4823 | + * Local variables: | ||
4824 | + * tab-width: 4 | ||
4825 | + * c-basic-offset: 4 | ||
4826 | + * indent-tabs-mode: t | ||
4827 | + * End: | ||
4828 | + */ | ||
4829 | + | ||
4830 | diff -Naur php-5.3.3/Zend/zend_alloc.h php-5.3.3-magellan/Zend/zend_alloc.h | ||
4831 | --- php-5.3.3/Zend/zend_alloc.h 2010-01-05 21:46:53.000000000 +0100 | ||
4832 | +++ php-5.3.3-magellan/Zend/zend_alloc.h 2010-07-26 12:11:25.000000000 +0200 | ||
4833 | @@ -203,6 +203,8 @@ | ||
4834 | |||
4835 | /* Heap functions */ | ||
4836 | typedef struct _zend_mm_heap zend_mm_heap; | ||
4837 | +typedef struct _zend_mm_heap_canary zend_mm_heap_canary; | ||
4838 | + | ||
4839 | |||
4840 | ZEND_API zend_mm_heap *zend_mm_startup(void); | ||
4841 | ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC); | ||
4842 | diff -Naur php-5.3.3/Zend/zend.c php-5.3.3-magellan/Zend/zend.c | ||
4843 | --- php-5.3.3/Zend/zend.c 2010-01-05 21:46:53.000000000 +0100 | ||
4844 | +++ php-5.3.3-magellan/Zend/zend.c 2010-07-26 12:11:25.000000000 +0200 | ||
4845 | @@ -60,6 +60,10 @@ | ||
4846 | ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC); | ||
4847 | ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRMLS_DC); | ||
4848 | |||
4849 | +#if SUHOSIN_PATCH | ||
4850 | +ZEND_API void (*zend_suhosin_log)(int loglevel, char *fmt, ...); | ||
4851 | +#endif | ||
4852 | + | ||
4853 | void (*zend_on_timeout)(int seconds TSRMLS_DC); | ||
4854 | |||
4855 | static void (*zend_message_dispatcher_p)(long message, void *data TSRMLS_DC); | ||
4856 | @@ -88,6 +92,74 @@ | ||
4857 | } | ||
4858 | /* }}} */ | ||
4859 | |||
4860 | +#if SUHOSIN_PATCH | ||
4861 | +static ZEND_INI_MH(OnUpdateSuhosin_log_syslog) | ||
4862 | +{ | ||
4863 | + if (!new_value) { | ||
4864 | + SPG(log_syslog) = S_ALL & ~S_SQL | S_MEMORY; | ||
4865 | + } else { | ||
4866 | + SPG(log_syslog) = atoi(new_value) | S_MEMORY; | ||
4867 | + } | ||
4868 | + return SUCCESS; | ||
4869 | +} | ||
4870 | +static ZEND_INI_MH(OnUpdateSuhosin_log_syslog_facility) | ||
4871 | +{ | ||
4872 | + if (!new_value) { | ||
4873 | + SPG(log_syslog_facility) = LOG_USER; | ||
4874 | + } else { | ||
4875 | + SPG(log_syslog_facility) = atoi(new_value); | ||
4876 | + } | ||
4877 | + return SUCCESS; | ||
4878 | +} | ||
4879 | +static ZEND_INI_MH(OnUpdateSuhosin_log_syslog_priority) | ||
4880 | +{ | ||
4881 | + if (!new_value) { | ||
4882 | + SPG(log_syslog_priority) = LOG_ALERT; | ||
4883 | + } else { | ||
4884 | + SPG(log_syslog_priority) = atoi(new_value); | ||
4885 | + } | ||
4886 | + return SUCCESS; | ||
4887 | +} | ||
4888 | +static ZEND_INI_MH(OnUpdateSuhosin_log_sapi) | ||
4889 | +{ | ||
4890 | + if (!new_value) { | ||
4891 | + SPG(log_sapi) = S_ALL & ~S_SQL; | ||
4892 | + } else { | ||
4893 | + SPG(log_sapi) = atoi(new_value); | ||
4894 | + } | ||
4895 | + return SUCCESS; | ||
4896 | +} | ||
4897 | +static ZEND_INI_MH(OnUpdateSuhosin_log_script) | ||
4898 | +{ | ||
4899 | + if (!new_value) { | ||
4900 | + SPG(log_script) = S_ALL & ~S_MEMORY; | ||
4901 | + } else { | ||
4902 | + SPG(log_script) = atoi(new_value) & (~S_MEMORY) & (~S_INTERNAL); | ||
4903 | + } | ||
4904 | + return SUCCESS; | ||
4905 | +} | ||
4906 | +static ZEND_INI_MH(OnUpdateSuhosin_log_scriptname) | ||
4907 | +{ | ||
4908 | + if (SPG(log_scriptname)) { | ||
4909 | + pefree(SPG(log_scriptname),1); | ||
4910 | + } | ||
4911 | + SPG(log_scriptname) = NULL; | ||
4912 | + if (new_value) { | ||
4913 | + SPG(log_scriptname) = pestrdup(new_value,1); | ||
4914 | + } | ||
4915 | + return SUCCESS; | ||
4916 | +} | ||
4917 | +static ZEND_INI_MH(OnUpdateSuhosin_log_phpscript) | ||
4918 | +{ | ||
4919 | + if (!new_value) { | ||
4920 | + SPG(log_phpscript) = S_ALL & ~S_MEMORY; | ||
4921 | + } else { | ||
4922 | + SPG(log_phpscript) = atoi(new_value) & (~S_MEMORY) & (~S_INTERNAL); | ||
4923 | + } | ||
4924 | + return SUCCESS; | ||
4925 | +} | ||
4926 | +#endif | ||
4927 | + | ||
4928 | ZEND_INI_BEGIN() | ||
4929 | ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting) | ||
4930 | STD_ZEND_INI_BOOLEAN("zend.enable_gc", "1", ZEND_INI_ALL, OnUpdateGCEnabled, gc_enabled, zend_gc_globals, gc_globals) | ||
4931 | diff -Naur php-5.3.3/Zend/zend_canary.c php-5.3.3-magellan/Zend/zend_canary.c | ||
4932 | --- php-5.3.3/Zend/zend_canary.c 1970-01-01 01:00:00.000000000 +0100 | ||
4933 | +++ php-5.3.3-magellan/Zend/zend_canary.c 2010-07-26 12:11:25.000000000 +0200 | ||
4934 | @@ -0,0 +1,66 @@ | ||
4935 | +/* | ||
4936 | + +----------------------------------------------------------------------+ | ||
4937 | + | Suhosin-Patch for PHP | | ||
4938 | + +----------------------------------------------------------------------+ | ||
4939 | + | Copyright (c) 2004-2009 Stefan Esser | | ||
4940 | + +----------------------------------------------------------------------+ | ||
4941 | + | This source file is subject to version 2.02 of the PHP license, | | ||
4942 | + | that is bundled with this package in the file LICENSE, and is | | ||
4943 | + | available at through the world-wide-web at | | ||
4944 | + | http://www.php.net/license/2_02.txt. | | ||
4945 | + | If you did not receive a copy of the PHP license and are unable to | | ||
4946 | + | obtain it through the world-wide-web, please send a note to | | ||
4947 | + | license@php.net so we can mail you a copy immediately. | | ||
4948 | + +----------------------------------------------------------------------+ | ||
4949 | + | Author: Stefan Esser <stefan.esser@sektioneins.de> | | ||
4950 | + +----------------------------------------------------------------------+ | ||
4951 | + */ | ||
4952 | +/* $Id: php5-5.3.3-suhosin-0.9.10-2.patch,v 1.1 2010-08-22 18:31:04 niro Exp $ */ | ||
4953 | + | ||
4954 | +#include "zend.h" | ||
4955 | + | ||
4956 | +#include <stdio.h> | ||
4957 | +#include <stdlib.h> | ||
4958 | + | ||
4959 | + | ||
4960 | +#if SUHOSIN_PATCH | ||
4961 | + | ||
4962 | +static size_t last_canary = 0x73625123; | ||
4963 | + | ||
4964 | +/* will be replaced later with more compatible method */ | ||
4965 | +ZEND_API void zend_canary(void *buf, int len) | ||
4966 | +{ | ||
4967 | + time_t t; | ||
4968 | + size_t canary; | ||
4969 | + int fd; | ||
4970 | + | ||
4971 | +#ifndef PHP_WIN32 | ||
4972 | + fd = open("/dev/urandom", 0); | ||
4973 | + if (fd != -1) { | ||
4974 | + int r = read(fd, buf, len); | ||
4975 | + close(fd); | ||
4976 | + if (r == len) { | ||
4977 | + return; | ||
4978 | + } | ||
4979 | + } | ||
4980 | +#endif | ||
4981 | + /* not good but we never want to do this */ | ||
4982 | + time(&t); | ||
4983 | + canary = *(unsigned int *)&t + getpid() << 16 + last_canary; | ||
4984 | + last_canary ^= (canary << 5) | (canary >> (32-5)); | ||
4985 | + /* When we ensure full win32 compatibility in next version | ||
4986 | + we will replace this with the random number code from zend_alloc.c */ | ||
4987 | + memcpy(buf, &canary, len); | ||
4988 | +} | ||
4989 | + | ||
4990 | +#endif | ||
4991 | + | ||
4992 | + | ||
4993 | +/* | ||
4994 | + * Local variables: | ||
4995 | + * tab-width: 4 | ||
4996 | + * c-basic-offset: 4 | ||
4997 | + * End: | ||
4998 | + * vim600: sw=4 ts=4 fdm=marker | ||
4999 | + * vim<600: sw=4 ts=4 | ||
5000 | + */ | ||
5001 | diff -Naur php-5.3.3/Zend/zend_compile.c php-5.3.3-magellan/Zend/zend_compile.c | ||
5002 | --- php-5.3.3/Zend/zend_compile.c 2010-06-28 18:37:57.000000000 +0200 | ||
5003 | +++ php-5.3.3-magellan/Zend/zend_compile.c 2010-07-26 12:11:25.000000000 +0200 | ||
5004 | @@ -73,6 +73,11 @@ | ||
5005 | } | ||
5006 | /* }}} */ | ||
5007 | |||
5008 | +#if SUHOSIN_PATCH | ||
5009 | +void *suhosin_zend_destroy_property_info_internal = zend_destroy_property_info_internal; | ||
5010 | +void *suhosin_zend_destroy_property_info = zend_destroy_property_info; | ||
5011 | +#endif | ||
5012 | + | ||
5013 | static void build_runtime_defined_function_key(zval *result, const char *name, int name_length TSRMLS_DC) /* {{{ */ | ||
5014 | { | ||
5015 | char char_pos_buf[32]; | ||
5016 | diff -Naur php-5.3.3/Zend/zend_compile.h php-5.3.3-magellan/Zend/zend_compile.h | ||
5017 | --- php-5.3.3/Zend/zend_compile.h 2010-06-10 11:13:22.000000000 +0200 | ||
5018 | +++ php-5.3.3-magellan/Zend/zend_compile.h 2010-07-26 12:11:25.000000000 +0200 | ||
5019 | @@ -606,6 +606,11 @@ | ||
5020 | ZEND_API int zend_auto_global_disable_jit(const char *varname, zend_uint varname_length TSRMLS_DC); | ||
5021 | ZEND_API size_t zend_dirname(char *path, size_t len); | ||
5022 | |||
5023 | +#if SUHOSIN_PATCH | ||
5024 | +extern void *suhosin_zend_destroy_property_info_internal; | ||
5025 | +extern void *suhosin_zend_destroy_property_info; | ||
5026 | +#endif | ||
5027 | + | ||
5028 | int zendlex(znode *zendlval TSRMLS_DC); | ||
5029 | |||
5030 | /* BEGIN: OPCODES */ | ||
5031 | diff -Naur php-5.3.3/Zend/zend_constants.c php-5.3.3-magellan/Zend/zend_constants.c | ||
5032 | --- php-5.3.3/Zend/zend_constants.c 2010-01-05 21:46:53.000000000 +0100 | ||
5033 | +++ php-5.3.3-magellan/Zend/zend_constants.c 2010-07-26 12:11:25.000000000 +0200 | ||
5034 | @@ -113,6 +113,76 @@ | ||
5035 | |||
5036 | REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS); | ||
5037 | |||
5038 | +#if SUHOSIN_PATCH | ||
5039 | + REGISTER_MAIN_LONG_CONSTANT("S_MEMORY", S_MEMORY, CONST_PERSISTENT | CONST_CS); | ||
5040 | + REGISTER_MAIN_LONG_CONSTANT("S_VARS", S_VARS, CONST_PERSISTENT | CONST_CS); | ||
5041 | + REGISTER_MAIN_LONG_CONSTANT("S_FILES", S_FILES, CONST_PERSISTENT | CONST_CS); | ||
5042 | + REGISTER_MAIN_LONG_CONSTANT("S_INCLUDE", S_INCLUDE, CONST_PERSISTENT | CONST_CS); | ||
5043 | + REGISTER_MAIN_LONG_CONSTANT("S_SQL", S_SQL, CONST_PERSISTENT | CONST_CS); | ||
5044 | + REGISTER_MAIN_LONG_CONSTANT("S_EXECUTOR", S_EXECUTOR, CONST_PERSISTENT | CONST_CS); | ||
5045 | + REGISTER_MAIN_LONG_CONSTANT("S_MAIL", S_MAIL, CONST_PERSISTENT | CONST_CS); | ||
5046 | + REGISTER_MAIN_LONG_CONSTANT("S_SESSION", S_SESSION, CONST_PERSISTENT | CONST_CS); | ||
5047 | + REGISTER_MAIN_LONG_CONSTANT("S_MISC", S_MISC, CONST_PERSISTENT | CONST_CS); | ||
5048 | + REGISTER_MAIN_LONG_CONSTANT("S_INTERNAL", S_INTERNAL, CONST_PERSISTENT | CONST_CS); | ||
5049 | + REGISTER_MAIN_LONG_CONSTANT("S_ALL", S_ALL, CONST_PERSISTENT | CONST_CS); | ||
5050 | + | ||
5051 | + /* error levels */ | ||
5052 | + REGISTER_MAIN_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */ | ||
5053 | + REGISTER_MAIN_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */ | ||
5054 | + REGISTER_MAIN_LONG_CONSTANT("LOG_CRIT", LOG_CRIT, CONST_CS | CONST_PERSISTENT); /* critical conditions */ | ||
5055 | + REGISTER_MAIN_LONG_CONSTANT("LOG_ERR", LOG_ERR, CONST_CS | CONST_PERSISTENT); | ||
5056 | + REGISTER_MAIN_LONG_CONSTANT("LOG_WARNING", LOG_WARNING, CONST_CS | CONST_PERSISTENT); | ||
5057 | + REGISTER_MAIN_LONG_CONSTANT("LOG_NOTICE", LOG_NOTICE, CONST_CS | CONST_PERSISTENT); | ||
5058 | + REGISTER_MAIN_LONG_CONSTANT("LOG_INFO", LOG_INFO, CONST_CS | CONST_PERSISTENT); | ||
5059 | + REGISTER_MAIN_LONG_CONSTANT("LOG_DEBUG", LOG_DEBUG, CONST_CS | CONST_PERSISTENT); | ||
5060 | + /* facility: type of program logging the message */ | ||
5061 | + REGISTER_MAIN_LONG_CONSTANT("LOG_KERN", LOG_KERN, CONST_CS | CONST_PERSISTENT); | ||
5062 | + REGISTER_MAIN_LONG_CONSTANT("LOG_USER", LOG_USER, CONST_CS | CONST_PERSISTENT); /* generic user level */ | ||
5063 | + REGISTER_MAIN_LONG_CONSTANT("LOG_MAIL", LOG_MAIL, CONST_CS | CONST_PERSISTENT); /* log to email */ | ||
5064 | + REGISTER_MAIN_LONG_CONSTANT("LOG_DAEMON", LOG_DAEMON, CONST_CS | CONST_PERSISTENT); /* other system daemons */ | ||
5065 | + REGISTER_MAIN_LONG_CONSTANT("LOG_AUTH", LOG_AUTH, CONST_CS | CONST_PERSISTENT); | ||
5066 | + REGISTER_MAIN_LONG_CONSTANT("LOG_SYSLOG", LOG_SYSLOG, CONST_CS | CONST_PERSISTENT); | ||
5067 | + REGISTER_MAIN_LONG_CONSTANT("LOG_LPR", LOG_LPR, CONST_CS | CONST_PERSISTENT); | ||
5068 | +#ifdef LOG_NEWS | ||
5069 | + /* No LOG_NEWS on HP-UX */ | ||
5070 | + REGISTER_MAIN_LONG_CONSTANT("LOG_NEWS", LOG_NEWS, CONST_CS | CONST_PERSISTENT); /* usenet new */ | ||
5071 | +#endif | ||
5072 | +#ifdef LOG_UUCP | ||
5073 | + /* No LOG_UUCP on HP-UX */ | ||
5074 | + REGISTER_MAIN_LONG_CONSTANT("LOG_UUCP", LOG_UUCP, CONST_CS | CONST_PERSISTENT); | ||
5075 | +#endif | ||
5076 | +#ifdef LOG_CRON | ||
5077 | + /* apparently some systems don't have this one */ | ||
5078 | + REGISTER_MAIN_LONG_CONSTANT("LOG_CRON", LOG_CRON, CONST_CS | CONST_PERSISTENT); | ||
5079 | +#endif | ||
5080 | +#ifdef LOG_AUTHPRIV | ||
5081 | + /* AIX doesn't have LOG_AUTHPRIV */ | ||
5082 | + REGISTER_MAIN_LONG_CONSTANT("LOG_AUTHPRIV", LOG_AUTHPRIV, CONST_CS | CONST_PERSISTENT); | ||
5083 | +#endif | ||
5084 | +#ifndef PHP_WIN32 | ||
5085 | + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL0", LOG_LOCAL0, CONST_CS | CONST_PERSISTENT); | ||
5086 | + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL1", LOG_LOCAL1, CONST_CS | CONST_PERSISTENT); | ||
5087 | + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL2", LOG_LOCAL2, CONST_CS | CONST_PERSISTENT); | ||
5088 | + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL3", LOG_LOCAL3, CONST_CS | CONST_PERSISTENT); | ||
5089 | + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL4", LOG_LOCAL4, CONST_CS | CONST_PERSISTENT); | ||
5090 | + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL5", LOG_LOCAL5, CONST_CS | CONST_PERSISTENT); | ||
5091 | + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL6", LOG_LOCAL6, CONST_CS | CONST_PERSISTENT); | ||
5092 | + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL7", LOG_LOCAL7, CONST_CS | CONST_PERSISTENT); | ||
5093 | +#endif | ||
5094 | + /* options */ | ||
5095 | + REGISTER_MAIN_LONG_CONSTANT("LOG_PID", LOG_PID, CONST_CS | CONST_PERSISTENT); | ||
5096 | + REGISTER_MAIN_LONG_CONSTANT("LOG_CONS", LOG_CONS, CONST_CS | CONST_PERSISTENT); | ||
5097 | + REGISTER_MAIN_LONG_CONSTANT("LOG_ODELAY", LOG_ODELAY, CONST_CS | CONST_PERSISTENT); | ||
5098 | + REGISTER_MAIN_LONG_CONSTANT("LOG_NDELAY", LOG_NDELAY, CONST_CS | CONST_PERSISTENT); | ||
5099 | +#ifdef LOG_NOWAIT | ||
5100 | + REGISTER_MAIN_LONG_CONSTANT("LOG_NOWAIT", LOG_NOWAIT, CONST_CS | CONST_PERSISTENT); | ||
5101 | +#endif | ||
5102 | +#ifdef LOG_PERROR | ||
5103 | + /* AIX doesn't have LOG_PERROR */ | ||
5104 | + REGISTER_MAIN_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/ | ||
5105 | +#endif | ||
5106 | +#endif | ||
5107 | + | ||
5108 | /* true/false constants */ | ||
5109 | { | ||
5110 | zend_constant c; | ||
5111 | diff -Naur php-5.3.3/Zend/Zend.dsp php-5.3.3-magellan/Zend/Zend.dsp | ||
5112 | --- php-5.3.3/Zend/Zend.dsp 2009-03-18 11:18:10.000000000 +0100 | ||
5113 | +++ php-5.3.3-magellan/Zend/Zend.dsp 2010-07-26 12:15:31.000000000 +0200 | ||
5114 | @@ -247,6 +247,14 @@ | ||
5115 | # End Source File | ||
5116 | # Begin Source File | ||
5117 | |||
5118 | +SOURCE=.\zend_canary.c | ||
5119 | +# End Source File | ||
5120 | +# Begin Source File | ||
5121 | + | ||
5122 | +SOURCE=.\zend_alloc_canary.c | ||
5123 | +# End Source File | ||
5124 | +# Begin Source File | ||
5125 | + | ||
5126 | SOURCE=.\zend_ts_hash.c | ||
5127 | # End Source File | ||
5128 | # Begin Source File | ||
5129 | diff -Naur php-5.3.3/Zend/zend_errors.h php-5.3.3-magellan/Zend/zend_errors.h | ||
5130 | --- php-5.3.3/Zend/zend_errors.h 2010-01-05 21:46:53.000000000 +0100 | ||
5131 | +++ php-5.3.3-magellan/Zend/zend_errors.h 2010-07-26 12:11:25.000000000 +0200 | ||
5132 | @@ -41,6 +41,20 @@ | ||
5133 | #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) | ||
5134 | #define E_CORE (E_CORE_ERROR | E_CORE_WARNING) | ||
5135 | |||
5136 | +#if SUHOSIN_PATCH | ||
5137 | +#define S_MEMORY (1<<0L) | ||
5138 | +#define S_MISC (1<<1L) | ||
5139 | +#define S_VARS (1<<2L) | ||
5140 | +#define S_FILES (1<<3L) | ||
5141 | +#define S_INCLUDE (1<<4L) | ||
5142 | +#define S_SQL (1<<5L) | ||
5143 | +#define S_EXECUTOR (1<<6L) | ||
5144 | +#define S_MAIL (1<<7L) | ||
5145 | +#define S_SESSION (1<<8L) | ||
5146 | +#define S_INTERNAL (1<<29L) | ||
5147 | +#define S_ALL (S_MEMORY | S_VARS | S_INCLUDE | S_FILES | S_MAIL | S_SESSION | S_MISC | S_SQL | S_EXECUTOR) | ||
5148 | +#endif | ||
5149 | + | ||
5150 | #endif /* ZEND_ERRORS_H */ | ||
5151 | |||
5152 | /* | ||
5153 | diff -Naur php-5.3.3/Zend/zend.h php-5.3.3-magellan/Zend/zend.h | ||
5154 | --- php-5.3.3/Zend/zend.h 2010-01-15 19:26:53.000000000 +0100 | ||
5155 | +++ php-5.3.3-magellan/Zend/zend.h 2010-07-26 12:11:25.000000000 +0200 | ||
5156 | @@ -627,6 +627,9 @@ | ||
5157 | extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap); | ||
5158 | extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC); | ||
5159 | extern ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRMLS_DC); | ||
5160 | +#if SUHOSIN_PATCH | ||
5161 | +extern ZEND_API void (*zend_suhosin_log)(int loglevel, char *fmt, ...); | ||
5162 | +#endif | ||
5163 | |||
5164 | ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3); | ||
5165 | |||
5166 | @@ -771,6 +774,16 @@ | ||
5167 | ZEND_API void zend_replace_error_handling(zend_error_handling_t error_handling, zend_class_entry *exception_class, zend_error_handling *current TSRMLS_DC); | ||
5168 | ZEND_API void zend_restore_error_handling(zend_error_handling *saved TSRMLS_DC); | ||
5169 | |||
5170 | +#if SUHOSIN_PATCH | ||
5171 | +#include "suhosin_globals.h" | ||
5172 | +#include "suhosin_patch.h" | ||
5173 | +#include "php_syslog.h" | ||
5174 | + | ||
5175 | +ZEND_API void zend_canary(void *buf, int len); | ||
5176 | +ZEND_API char suhosin_get_config(int element); | ||
5177 | + | ||
5178 | +#endif | ||
5179 | + | ||
5180 | #endif /* ZEND_H */ | ||
5181 | |||
5182 | /* | ||
5183 | diff -Naur php-5.3.3/Zend/zend_hash.c php-5.3.3-magellan/Zend/zend_hash.c | ||
5184 | --- php-5.3.3/Zend/zend_hash.c 2010-05-03 18:36:04.000000000 +0200 | ||
5185 | +++ php-5.3.3-magellan/Zend/zend_hash.c 2010-07-26 12:11:25.000000000 +0200 | ||
5186 | @@ -20,6 +20,7 @@ | ||
5187 | /* $Id: php5-5.3.3-suhosin-0.9.10-2.patch,v 1.1 2010-08-22 18:31:04 niro Exp $ */ | ||
5188 | |||
5189 | #include "zend.h" | ||
5190 | +#include "zend_compile.h" | ||
5191 | |||
5192 | #define CONNECT_TO_BUCKET_DLLIST(element, list_head) \ | ||
5193 | (element)->pNext = (list_head); \ | ||
5194 | @@ -133,6 +134,199 @@ | ||
5195 | } | ||
5196 | |||
5197 | |||
5198 | +#if SUHOSIN_PATCH | ||
5199 | +#ifdef ZTS | ||
5200 | +static MUTEX_T zend_hash_dprot_mx_reader; | ||
5201 | +static MUTEX_T zend_hash_dprot_mx_writer; | ||
5202 | +static unsigned int zend_hash_dprot_reader; | ||
5203 | +#endif | ||
5204 | +static unsigned int zend_hash_dprot_counter; | ||
5205 | +static unsigned int zend_hash_dprot_curmax; | ||
5206 | +static dtor_func_t *zend_hash_dprot_table = NULL; | ||
5207 | + | ||
5208 | +static void zend_hash_dprot_begin_read() | ||
5209 | +{ | ||
5210 | +#ifdef ZTS | ||
5211 | + tsrm_mutex_lock(zend_hash_dprot_mx_reader); | ||
5212 | + if ((++(zend_hash_dprot_reader)) == 1) { | ||
5213 | + tsrm_mutex_lock(zend_hash_dprot_mx_writer); | ||
5214 | + } | ||
5215 | + tsrm_mutex_unlock(zend_hash_dprot_mx_reader); | ||
5216 | +#endif | ||
5217 | +} | ||
5218 | + | ||
5219 | +static void zend_hash_dprot_end_read() | ||
5220 | +{ | ||
5221 | +#ifdef ZTS | ||
5222 | + tsrm_mutex_lock(zend_hash_dprot_mx_reader); | ||
5223 | + if ((--(zend_hash_dprot_reader)) == 0) { | ||
5224 | + tsrm_mutex_unlock(zend_hash_dprot_mx_writer); | ||
5225 | + } | ||
5226 | + tsrm_mutex_unlock(zend_hash_dprot_mx_reader); | ||
5227 | +#endif | ||
5228 | +} | ||
5229 | + | ||
5230 | +static void zend_hash_dprot_begin_write() | ||
5231 | +{ | ||
5232 | +#ifdef ZTS | ||
5233 | + tsrm_mutex_lock(zend_hash_dprot_mx_writer); | ||
5234 | +#endif | ||
5235 | +} | ||
5236 | + | ||
5237 | +static void zend_hash_dprot_end_write() | ||
5238 | +{ | ||
5239 | +#ifdef ZTS | ||
5240 | + tsrm_mutex_unlock(zend_hash_dprot_mx_writer); | ||
5241 | +#endif | ||
5242 | +} | ||
5243 | + | ||
5244 | +/*ZEND_API void zend_hash_dprot_dtor() | ||
5245 | +{ | ||
5246 | +#ifdef ZTS | ||
5247 | + tsrm_mutex_free(zend_hash_dprot_mx_reader); | ||
5248 | + tsrm_mutex_free(zend_hash_dprot_mx_writer); | ||
5249 | +#endif | ||
5250 | + free(zend_hash_dprot_table); | ||
5251 | +}*/ | ||
5252 | + | ||
5253 | +static void zend_hash_add_destructor(dtor_func_t pDestructor) | ||
5254 | +{ | ||
5255 | + int left, right, mid; | ||
5256 | + zend_bool found = 0; | ||
5257 | + unsigned long value; | ||
5258 | + | ||
5259 | + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR || pDestructor == ZVAL_INTERNAL_PTR_DTOR | ||
5260 | + || pDestructor == ZEND_FUNCTION_DTOR || pDestructor == ZEND_CLASS_DTOR) { | ||
5261 | + return; | ||
5262 | + } | ||
5263 | + | ||
5264 | + if (zend_hash_dprot_table == NULL) { | ||
5265 | +#ifdef ZTS | ||
5266 | + zend_hash_dprot_mx_reader = tsrm_mutex_alloc(); | ||
5267 | + zend_hash_dprot_mx_writer = tsrm_mutex_alloc(); | ||
5268 | + zend_hash_dprot_reader = 0; | ||
5269 | +#endif | ||
5270 | + zend_hash_dprot_counter = 0; | ||
5271 | + zend_hash_dprot_curmax = 256; | ||
5272 | + zend_hash_dprot_table = (dtor_func_t *) malloc(256 * sizeof(dtor_func_t)); | ||
5273 | + } | ||
5274 | + | ||
5275 | + zend_hash_dprot_begin_write(); | ||
5276 | + | ||
5277 | + if (zend_hash_dprot_counter == 0) { | ||
5278 | + zend_hash_dprot_counter++; | ||
5279 | + zend_hash_dprot_table[0] = pDestructor; | ||
5280 | + } else { | ||
5281 | + value = (unsigned long) pDestructor; | ||
5282 | + left = 0; | ||
5283 | + right = zend_hash_dprot_counter-1; | ||
5284 | + mid = 0; | ||
5285 | + | ||
5286 | + while (left < right) { | ||
5287 | + mid = (right - left) >> 1; | ||
5288 | + mid += left; | ||
5289 | + if ((unsigned long)zend_hash_dprot_table[mid] == value) { | ||
5290 | + found = 1; | ||
5291 | + break; | ||
5292 | + } | ||
5293 | + if (value < (unsigned long)zend_hash_dprot_table[mid]) { | ||
5294 | + right = mid-1; | ||
5295 | + } else { | ||
5296 | + left = mid+1; | ||
5297 | + } | ||
5298 | + } | ||
5299 | + if ((unsigned long)zend_hash_dprot_table[left] == value) { | ||
5300 | + found = 1; | ||
5301 | + } | ||
5302 | + | ||
5303 | + if (!found) { | ||
5304 | + | ||
5305 | + if (zend_hash_dprot_counter >= zend_hash_dprot_curmax) { | ||
5306 | + zend_hash_dprot_curmax += 256; | ||
5307 | + zend_hash_dprot_table = (dtor_func_t *) realloc(zend_hash_dprot_table, zend_hash_dprot_curmax * sizeof(dtor_func_t)); | ||
5308 | + } | ||
5309 | + | ||
5310 | + if ((unsigned long)zend_hash_dprot_table[left] < value) { | ||
5311 | + memmove(zend_hash_dprot_table+left+2, zend_hash_dprot_table+left+1, (zend_hash_dprot_counter-left-1)*sizeof(dtor_func_t)); | ||
5312 | + zend_hash_dprot_table[left+1] = pDestructor; | ||
5313 | + } else { | ||
5314 | + memmove(zend_hash_dprot_table+left+1, zend_hash_dprot_table+left, (zend_hash_dprot_counter-left)*sizeof(dtor_func_t)); | ||
5315 | + zend_hash_dprot_table[left] = pDestructor; | ||
5316 | + } | ||
5317 | + | ||
5318 | + zend_hash_dprot_counter++; | ||
5319 | + } | ||
5320 | + } | ||
5321 | + | ||
5322 | + zend_hash_dprot_end_write(); | ||
5323 | +} | ||
5324 | + | ||
5325 | +static void zend_hash_check_destructor(dtor_func_t pDestructor) | ||
5326 | +{ | ||
5327 | + unsigned long value; | ||
5328 | + | ||
5329 | + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR || pDestructor == ZVAL_INTERNAL_PTR_DTOR | ||
5330 | +#ifdef ZEND_ENGINE_2 | ||
5331 | + || pDestructor == suhosin_zend_destroy_property_info_internal || pDestructor == suhosin_zend_destroy_property_info | ||
5332 | +#endif | ||
5333 | + || pDestructor == ZEND_FUNCTION_DTOR || pDestructor == ZEND_CLASS_DTOR) { | ||
5334 | + return; | ||
5335 | + } | ||
5336 | + | ||
5337 | + zend_hash_dprot_begin_read(); | ||
5338 | + | ||
5339 | + if (zend_hash_dprot_counter > 0) { | ||
5340 | + int left, right, mid; | ||
5341 | + zend_bool found = 0; | ||
5342 | + | ||
5343 | + value = (unsigned long) pDestructor; | ||
5344 | + left = 0; | ||
5345 | + right = zend_hash_dprot_counter-1; | ||
5346 | + | ||
5347 | + while (left < right) { | ||
5348 | + mid = (right - left) >> 1; | ||
5349 | + mid += left; | ||
5350 | + if ((unsigned long)zend_hash_dprot_table[mid] == value) { | ||
5351 | + found = 1; | ||
5352 | + break; | ||
5353 | + } | ||
5354 | + if (value < (unsigned long)zend_hash_dprot_table[mid]) { | ||
5355 | + right = mid-1; | ||
5356 | + } else { | ||
5357 | + left = mid+1; | ||
5358 | + } | ||
5359 | + } | ||
5360 | + if ((unsigned long)zend_hash_dprot_table[left] == value) { | ||
5361 | + found = 1; | ||
5362 | + } | ||
5363 | + | ||
5364 | + if (!found) { | ||
5365 | + zend_hash_dprot_end_read(); | ||
5366 | + | ||
5367 | + zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown Hashtable destructor"); | ||
5368 | + if (SUHOSIN_CONFIG(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR) == 0) { | ||
5369 | + _exit(1); | ||
5370 | + } | ||
5371 | + return; | ||
5372 | + } | ||
5373 | + | ||
5374 | + } else { | ||
5375 | + zend_hash_dprot_end_read(); | ||
5376 | + | ||
5377 | + zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown Hashtable destructor"); | ||
5378 | + if (SUHOSIN_CONFIG(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR) == 0) { | ||
5379 | + _exit(1); | ||
5380 | + } | ||
5381 | + return; | ||
5382 | + } | ||
5383 | + | ||
5384 | + zend_hash_dprot_end_read(); | ||
5385 | +} | ||
5386 | + | ||
5387 | +#else | ||
5388 | +#define zend_hash_add_destructor(pDestructor) do {} while(0) | ||
5389 | +#define zend_hash_check_destructor(pDestructor) do {} while(0) | ||
5390 | +#endif | ||
5391 | |||
5392 | ZEND_API int _zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, zend_bool persistent ZEND_FILE_LINE_DC) | ||
5393 | { | ||
5394 | @@ -153,6 +347,7 @@ | ||
5395 | |||
5396 | ht->nTableMask = ht->nTableSize - 1; | ||
5397 | ht->pDestructor = pDestructor; | ||
5398 | + zend_hash_add_destructor(pDestructor); | ||
5399 | ht->arBuckets = NULL; | ||
5400 | ht->pListHead = NULL; | ||
5401 | ht->pListTail = NULL; | ||
5402 | @@ -230,6 +425,7 @@ | ||
5403 | return FAILURE; | ||
5404 | } | ||
5405 | #endif | ||
5406 | + zend_hash_check_destructor(ht->pDestructor); | ||
5407 | if (ht->pDestructor) { | ||
5408 | ht->pDestructor(p->pData); | ||
5409 | } | ||
5410 | @@ -295,6 +491,7 @@ | ||
5411 | return FAILURE; | ||
5412 | } | ||
5413 | #endif | ||
5414 | + zend_hash_check_destructor(ht->pDestructor); | ||
5415 | if (ht->pDestructor) { | ||
5416 | ht->pDestructor(p->pData); | ||
5417 | } | ||
5418 | @@ -370,6 +567,7 @@ | ||
5419 | return FAILURE; | ||
5420 | } | ||
5421 | #endif | ||
5422 | + zend_hash_check_destructor(ht->pDestructor); | ||
5423 | if (ht->pDestructor) { | ||
5424 | ht->pDestructor(p->pData); | ||
5425 | } | ||
5426 | @@ -493,6 +691,7 @@ | ||
5427 | if (ht->pInternalPointer == p) { | ||
5428 | ht->pInternalPointer = p->pListNext; | ||
5429 | } | ||
5430 | + zend_hash_check_destructor(ht->pDestructor); | ||
5431 | if (ht->pDestructor) { | ||
5432 | ht->pDestructor(p->pData); | ||
5433 | } | ||
5434 | @@ -519,6 +718,7 @@ | ||
5435 | SET_INCONSISTENT(HT_IS_DESTROYING); | ||
5436 | |||
5437 | p = ht->pListHead; | ||
5438 | + zend_hash_check_destructor(ht->pDestructor); | ||
5439 | while (p != NULL) { | ||
5440 | q = p; | ||
5441 | p = p->pListNext; | ||
5442 | @@ -545,6 +745,7 @@ | ||
5443 | SET_INCONSISTENT(HT_CLEANING); | ||
5444 | |||
5445 | p = ht->pListHead; | ||
5446 | + zend_hash_check_destructor(ht->pDestructor); | ||
5447 | while (p != NULL) { | ||
5448 | q = p; | ||
5449 | p = p->pListNext; | ||
5450 | @@ -607,6 +808,7 @@ | ||
5451 | ht->nNumOfElements--; | ||
5452 | HANDLE_UNBLOCK_INTERRUPTIONS(); | ||
5453 | |||
5454 | + zend_hash_check_destructor(ht->pDestructor); | ||
5455 | if (ht->pDestructor) { | ||
5456 | ht->pDestructor(p->pData); | ||
5457 | } | ||
5458 | diff -Naur php-5.3.3/Zend/zend_llist.c php-5.3.3-magellan/Zend/zend_llist.c | ||
5459 | --- php-5.3.3/Zend/zend_llist.c 2010-01-05 21:46:53.000000000 +0100 | ||
5460 | +++ php-5.3.3-magellan/Zend/zend_llist.c 2010-07-26 12:11:25.000000000 +0200 | ||
5461 | @@ -23,6 +23,194 @@ | ||
5462 | #include "zend_llist.h" | ||
5463 | #include "zend_qsort.h" | ||
5464 | |||
5465 | +#if SUHOSIN_PATCH | ||
5466 | +#ifdef ZTS | ||
5467 | +static MUTEX_T zend_llist_dprot_mx_reader; | ||
5468 | +static MUTEX_T zend_llist_dprot_mx_writer; | ||
5469 | +static unsigned int zend_llist_dprot_reader; | ||
5470 | +#endif | ||
5471 | +static unsigned int zend_llist_dprot_counter; | ||
5472 | +static unsigned int zend_llist_dprot_curmax; | ||
5473 | +static llist_dtor_func_t *zend_llist_dprot_table = NULL; | ||
5474 | + | ||
5475 | +static void zend_llist_dprot_begin_read() | ||
5476 | +{ | ||
5477 | +#ifdef ZTS | ||
5478 | + tsrm_mutex_lock(zend_llist_dprot_mx_reader); | ||
5479 | + if ((++(zend_llist_dprot_reader)) == 1) { | ||
5480 | + tsrm_mutex_lock(zend_llist_dprot_mx_writer); | ||
5481 | + } | ||
5482 | + tsrm_mutex_unlock(zend_llist_dprot_mx_reader); | ||
5483 | +#endif | ||
5484 | +} | ||
5485 | + | ||
5486 | +static void zend_llist_dprot_end_read() | ||
5487 | +{ | ||
5488 | +#ifdef ZTS | ||
5489 | + tsrm_mutex_lock(zend_llist_dprot_mx_reader); | ||
5490 | + if ((--(zend_llist_dprot_reader)) == 0) { | ||
5491 | + tsrm_mutex_unlock(zend_llist_dprot_mx_writer); | ||
5492 | + } | ||
5493 | + tsrm_mutex_unlock(zend_llist_dprot_mx_reader); | ||
5494 | +#endif | ||
5495 | +} | ||
5496 | + | ||
5497 | +static void zend_llist_dprot_begin_write() | ||
5498 | +{ | ||
5499 | +#ifdef ZTS | ||
5500 | + tsrm_mutex_lock(zend_llist_dprot_mx_writer); | ||
5501 | +#endif | ||
5502 | +} | ||
5503 | + | ||
5504 | +static void zend_llist_dprot_end_write() | ||
5505 | +{ | ||
5506 | +#ifdef ZTS | ||
5507 | + tsrm_mutex_unlock(zend_llist_dprot_mx_writer); | ||
5508 | +#endif | ||
5509 | +} | ||
5510 | + | ||
5511 | +/*ZEND_API void zend_llist_dprot_dtor() | ||
5512 | +{ | ||
5513 | +#ifdef ZTS | ||
5514 | + tsrm_mutex_free(zend_llist_dprot_mx_reader); | ||
5515 | + tsrm_mutex_free(zend_llist_dprot_mx_writer); | ||
5516 | +#endif | ||
5517 | + free(zend_llist_dprot_table); | ||
5518 | +}*/ | ||
5519 | + | ||
5520 | +static void zend_llist_add_destructor(llist_dtor_func_t pDestructor) | ||
5521 | +{ | ||
5522 | + int left, right, mid; | ||
5523 | + zend_bool found = 0; | ||
5524 | + unsigned long value; | ||
5525 | + | ||
5526 | + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR) { | ||
5527 | + return; | ||
5528 | + } | ||
5529 | + | ||
5530 | + if (zend_llist_dprot_table == NULL) { | ||
5531 | +#ifdef ZTS | ||
5532 | + zend_llist_dprot_mx_reader = tsrm_mutex_alloc(); | ||
5533 | + zend_llist_dprot_mx_writer = tsrm_mutex_alloc(); | ||
5534 | + zend_llist_dprot_reader = 0; | ||
5535 | +#endif | ||
5536 | + zend_llist_dprot_counter = 0; | ||
5537 | + zend_llist_dprot_curmax = 256; | ||
5538 | + zend_llist_dprot_table = (llist_dtor_func_t *) malloc(256 * sizeof(llist_dtor_func_t)); | ||
5539 | + } | ||
5540 | + | ||
5541 | + zend_llist_dprot_begin_write(); | ||
5542 | + | ||
5543 | + if (zend_llist_dprot_counter == 0) { | ||
5544 | + zend_llist_dprot_counter++; | ||
5545 | + zend_llist_dprot_table[0] = pDestructor; | ||
5546 | + } else { | ||
5547 | + value = (unsigned long) pDestructor; | ||
5548 | + left = 0; | ||
5549 | + right = zend_llist_dprot_counter-1; | ||
5550 | + mid = 0; | ||
5551 | + | ||
5552 | + while (left < right) { | ||
5553 | + mid = (right - left) >> 1; | ||
5554 | + mid += left; | ||
5555 | + if ((unsigned long)zend_llist_dprot_table[mid] == value) { | ||
5556 | + found = 1; | ||
5557 | + break; | ||
5558 | + } | ||
5559 | + if (value < (unsigned long)zend_llist_dprot_table[mid]) { | ||
5560 | + right = mid-1; | ||
5561 | + } else { | ||
5562 | + left = mid+1; | ||
5563 | + } | ||
5564 | + } | ||
5565 | + if ((unsigned long)zend_llist_dprot_table[left] == value) { | ||
5566 | + found = 1; | ||
5567 | + } | ||
5568 | + | ||
5569 | + if (!found) { | ||
5570 | + | ||
5571 | + if (zend_llist_dprot_counter >= zend_llist_dprot_curmax) { | ||
5572 | + zend_llist_dprot_curmax += 256; | ||
5573 | + zend_llist_dprot_table = (llist_dtor_func_t *) realloc(zend_llist_dprot_table, zend_llist_dprot_curmax * sizeof(llist_dtor_func_t)); | ||
5574 | + } | ||
5575 | + | ||
5576 | + if ((unsigned long)zend_llist_dprot_table[left] < value) { | ||
5577 | + memmove(zend_llist_dprot_table+left+2, zend_llist_dprot_table+left+1, (zend_llist_dprot_counter-left-1)*sizeof(llist_dtor_func_t)); | ||
5578 | + zend_llist_dprot_table[left+1] = pDestructor; | ||
5579 | + } else { | ||
5580 | + memmove(zend_llist_dprot_table+left+1, zend_llist_dprot_table+left, (zend_llist_dprot_counter-left)*sizeof(llist_dtor_func_t)); | ||
5581 | + zend_llist_dprot_table[left] = pDestructor; | ||
5582 | + } | ||
5583 | + | ||
5584 | + zend_llist_dprot_counter++; | ||
5585 | + } | ||
5586 | + } | ||
5587 | + | ||
5588 | + zend_llist_dprot_end_write(); | ||
5589 | +} | ||
5590 | + | ||
5591 | +static void zend_llist_check_destructor(llist_dtor_func_t pDestructor) | ||
5592 | +{ | ||
5593 | + unsigned long value; | ||
5594 | + | ||
5595 | + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR) { | ||
5596 | + return; | ||
5597 | + } | ||
5598 | + | ||
5599 | + zend_llist_dprot_begin_read(); | ||
5600 | + | ||
5601 | + if (zend_llist_dprot_counter > 0) { | ||
5602 | + int left, right, mid; | ||
5603 | + zend_bool found = 0; | ||
5604 | + | ||
5605 | + value = (unsigned long) pDestructor; | ||
5606 | + left = 0; | ||
5607 | + right = zend_llist_dprot_counter-1; | ||
5608 | + | ||
5609 | + while (left < right) { | ||
5610 | + mid = (right - left) >> 1; | ||
5611 | + mid += left; | ||
5612 | + if ((unsigned long)zend_llist_dprot_table[mid] == value) { | ||
5613 | + found = 1; | ||
5614 | + break; | ||
5615 | + } | ||
5616 | + if (value < (unsigned long)zend_llist_dprot_table[mid]) { | ||
5617 | + right = mid-1; | ||
5618 | + } else { | ||
5619 | + left = mid+1; | ||
5620 | + } | ||
5621 | + } | ||
5622 | + if ((unsigned long)zend_llist_dprot_table[left] == value) { | ||
5623 | + found = 1; | ||
5624 | + } | ||
5625 | + | ||
5626 | + if (!found) { | ||
5627 | + zend_llist_dprot_end_read(); | ||
5628 | + | ||
5629 | + zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown llist destructor"); | ||
5630 | + if (SUHOSIN_CONFIG(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR) == 0) { | ||
5631 | + _exit(1); | ||
5632 | + } | ||
5633 | + return; | ||
5634 | + } | ||
5635 | + | ||
5636 | + } else { | ||
5637 | + zend_llist_dprot_end_read(); | ||
5638 | + | ||
5639 | + zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown llist destructor"); | ||
5640 | + if (SUHOSIN_CONFIG(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR) == 0) { | ||
5641 | + _exit(1); | ||
5642 | + } | ||
5643 | + return; | ||
5644 | + } | ||
5645 | + | ||
5646 | + zend_llist_dprot_end_read(); | ||
5647 | +} | ||
5648 | +#else | ||
5649 | +#define zend_llist_add_destructor(pDestructor) do {} while(0) | ||
5650 | +#define zend_llist_check_destructor(pDestructor) do {} while(0) | ||
5651 | +#endif | ||
5652 | + | ||
5653 | ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent) | ||
5654 | { | ||
5655 | l->head = NULL; | ||
5656 | @@ -30,6 +218,7 @@ | ||
5657 | l->count = 0; | ||
5658 | l->size = size; | ||
5659 | l->dtor = dtor; | ||
5660 | + zend_llist_add_destructor(dtor); | ||
5661 | l->persistent = persistent; | ||
5662 | } | ||
5663 | |||
5664 | @@ -81,6 +270,7 @@ | ||
5665 | } else {\ | ||
5666 | (l)->tail = (current)->prev;\ | ||
5667 | }\ | ||
5668 | + zend_llist_check_destructor((l)->dtor); \ | ||
5669 | if ((l)->dtor) {\ | ||
5670 | (l)->dtor((current)->data);\ | ||
5671 | }\ | ||
5672 | @@ -108,6 +298,7 @@ | ||
5673 | { | ||
5674 | zend_llist_element *current=l->head, *next; | ||
5675 | |||
5676 | + zend_llist_check_destructor(l->dtor); | ||
5677 | while (current) { | ||
5678 | next = current->next; | ||
5679 | if (l->dtor) { | ||
5680 | @@ -133,6 +324,7 @@ | ||
5681 | zend_llist_element *old_tail; | ||
5682 | void *data; | ||
5683 | |||
5684 | + zend_llist_check_destructor((l)->dtor); | ||
5685 | if ((old_tail = l->tail)) { | ||
5686 | if (old_tail->prev) { | ||
5687 | old_tail->prev->next = NULL; | ||
5688 | diff -Naur php-5.3.3/Zend/zend_operators.c php-5.3.3-magellan/Zend/zend_operators.c | ||
5689 | --- php-5.3.3/Zend/zend_operators.c 2010-06-26 19:14:33.000000000 +0200 | ||
5690 | +++ php-5.3.3-magellan/Zend/zend_operators.c 2010-07-26 12:11:25.000000000 +0200 | ||
5691 | @@ -153,9 +153,14 @@ | ||
5692 | case IS_STRING: | ||
5693 | { | ||
5694 | char *strval; | ||
5695 | + int strl; | ||
5696 | |||
5697 | strval = Z_STRVAL_P(op); | ||
5698 | - if ((Z_TYPE_P(op)=is_numeric_string(strval, Z_STRLEN_P(op), &Z_LVAL_P(op), &Z_DVAL_P(op), 1)) == 0) { | ||
5699 | + strl = Z_STRLEN_P(op); | ||
5700 | +#if SUHOSIN_PATCH | ||
5701 | + Z_STRLEN_P(op) = 0; | ||
5702 | +#endif | ||
5703 | + if ((Z_TYPE_P(op)=is_numeric_string(strval, strl, &Z_LVAL_P(op), &Z_DVAL_P(op), 1)) == 0) { | ||
5704 | ZVAL_LONG(op, 0); | ||
5705 | } | ||
5706 | STR_FREE(strval); | ||
5707 | @@ -187,7 +192,8 @@ | ||
5708 | } else { \ | ||
5709 | switch (Z_TYPE_P(op)) { \ | ||
5710 | case IS_STRING: \ | ||
5711 | - { \ | ||
5712 | + { \ | ||
5713 | + Z_STRLEN(holder) = 0; \ | ||
5714 | if ((Z_TYPE(holder)=is_numeric_string(Z_STRVAL_P(op), Z_STRLEN_P(op), &Z_LVAL(holder), &Z_DVAL(holder), 1)) == 0) { \ | ||
5715 | ZVAL_LONG(&(holder), 0); \ | ||
5716 | } \ | ||
5717 | @@ -229,6 +235,7 @@ | ||
5718 | Z_LVAL(holder) = zend_dval_to_lval(Z_DVAL_P(op)); \ | ||
5719 | break; \ | ||
5720 | case IS_STRING: \ | ||
5721 | + Z_STRLEN(holder) = 0; \ | ||
5722 | Z_LVAL(holder) = strtol(Z_STRVAL_P(op), NULL, 10); \ | ||
5723 | break; \ | ||
5724 | case IS_ARRAY: \ | ||
5725 | @@ -271,6 +278,7 @@ | ||
5726 | Z_LVAL(holder) = (Z_DVAL_P(op) ? 1 : 0); \ | ||
5727 | break; \ | ||
5728 | case IS_STRING: \ | ||
5729 | + Z_STRLEN(holder) = 0; \ | ||
5730 | if (Z_STRLEN_P(op) == 0 \ | ||
5731 | || (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) { \ | ||
5732 | Z_LVAL(holder) = 0; \ | ||
5733 | @@ -356,6 +364,9 @@ | ||
5734 | { | ||
5735 | char *strval = Z_STRVAL_P(op); | ||
5736 | |||
5737 | +#if SUHOSIN_PATCH | ||
5738 | + Z_STRLEN_P(op) = 0; | ||
5739 | +#endif | ||
5740 | Z_LVAL_P(op) = strtol(strval, NULL, base); | ||
5741 | STR_FREE(strval); | ||
5742 | } | ||
5743 | @@ -416,6 +427,9 @@ | ||
5744 | { | ||
5745 | char *strval = Z_STRVAL_P(op); | ||
5746 | |||
5747 | +#if SUHOSIN_PATCH | ||
5748 | + Z_STRLEN_P(op) = 0; | ||
5749 | +#endif | ||
5750 | Z_DVAL_P(op) = zend_strtod(strval, NULL); | ||
5751 | STR_FREE(strval); | ||
5752 | } | ||
5753 | @@ -502,8 +516,14 @@ | ||
5754 | |||
5755 | if (Z_STRLEN_P(op) == 0 | ||
5756 | || (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) { | ||
5757 | +#if SUHOSIN_PATCH | ||
5758 | + Z_STRLEN_P(op) = 0; | ||
5759 | +#endif | ||
5760 | Z_LVAL_P(op) = 0; | ||
5761 | } else { | ||
5762 | +#if SUHOSIN_PATCH | ||
5763 | + Z_STRLEN_P(op) = 0; | ||
5764 | +#endif | ||
5765 | Z_LVAL_P(op) = 1; | ||
5766 | } | ||
5767 | STR_FREE(strval); | ||
5768 | @@ -617,6 +637,9 @@ | ||
5769 | *entry = *op; | ||
5770 | INIT_PZVAL(entry); | ||
5771 | |||
5772 | +#if SUHOSIN_PATCH | ||
5773 | + Z_STRLEN_P(op) = 0; | ||
5774 | +#endif | ||
5775 | switch (type) { | ||
5776 | case IS_ARRAY: | ||
5777 | ALLOC_HASHTABLE(Z_ARRVAL_P(op)); | ||
5778 | diff -Naur php-5.3.3/Zend/ZendTS.dsp php-5.3.3-magellan/Zend/ZendTS.dsp | ||
5779 | --- php-5.3.3/Zend/ZendTS.dsp 2008-07-14 11:49:03.000000000 +0200 | ||
5780 | +++ php-5.3.3-magellan/Zend/ZendTS.dsp 2010-07-26 12:16:10.000000000 +0200 | ||
5781 | @@ -277,6 +277,14 @@ | ||
5782 | # End Source File | ||
5783 | # Begin Source File | ||
5784 | |||
5785 | +SOURCE=.\zend_canary.c | ||
5786 | +# End Source File | ||
5787 | +# Begin Source File | ||
5788 | + | ||
5789 | +SOURCE=.\zend_alloc_canary.c | ||
5790 | +# End Source File | ||
5791 | +# Begin Source File | ||
5792 | + | ||
5793 | SOURCE=.\zend_ts_hash.c | ||
5794 | # End Source File | ||
5795 | # Begin Source File | ||
5796 | diff -Naur php-5.3.3/Zend/zend_variables.c php-5.3.3-magellan/Zend/zend_variables.c | ||
5797 | --- php-5.3.3/Zend/zend_variables.c 2010-01-11 11:07:10.000000000 +0100 | ||
5798 | +++ php-5.3.3-magellan/Zend/zend_variables.c 2010-07-26 12:11:25.000000000 +0200 | ||
5799 | @@ -34,6 +34,9 @@ | ||
5800 | case IS_CONSTANT: | ||
5801 | CHECK_ZVAL_STRING_REL(zvalue); | ||
5802 | STR_FREE_REL(zvalue->value.str.val); | ||
5803 | +#if SUHOSIN_PATCH | ||
5804 | + zvalue->value.str.len = 0; | ||
5805 | +#endif | ||
5806 | break; | ||
5807 | case IS_ARRAY: | ||
5808 | case IS_CONSTANT_ARRAY: { | ||
5809 | @@ -78,6 +81,9 @@ | ||
5810 | case IS_CONSTANT: | ||
5811 | CHECK_ZVAL_STRING_REL(zvalue); | ||
5812 | free(zvalue->value.str.val); | ||
5813 | +#if SUHOSIN_PATCH | ||
5814 | + zvalue->value.str.len = 0; | ||
5815 | +#endif | ||
5816 | break; | ||
5817 | case IS_ARRAY: | ||
5818 | case IS_CONSTANT_ARRAY: |