|
 |
b6cbd1 |
From 3804c0d00fa6e629173fb1c8c61f8f88d5fe39b9 Mon Sep 17 00:00:00 2001
|
|
|
b6cbd1 |
From: Stanislav Malyshev <stas@php.net>
|
|
|
b6cbd1 |
Date: Mon, 23 Jun 2014 00:19:37 -0700
|
|
|
b6cbd1 |
Subject: [PATCH] Fix bug #67498 - phpinfo() Type Confusion Information Leak
|
|
|
b6cbd1 |
Vulnerability
|
|
|
b6cbd1 |
|
|
|
b6cbd1 |
---
|
|
|
b6cbd1 |
ext/standard/info.c | 8 ++++----
|
|
|
b6cbd1 |
ext/standard/tests/general_functions/bug67498.phpt | 15 +++++++++++++++
|
|
|
b6cbd1 |
2 files changed, 19 insertions(+), 4 deletions(-)
|
|
|
b6cbd1 |
create mode 100644 ext/standard/tests/general_functions/bug67498.phpt
|
|
|
b6cbd1 |
|
|
|
b6cbd1 |
diff --git a/ext/standard/info.c b/ext/standard/info.c
|
|
|
b6cbd1 |
index 03ced35..0626a70 100644
|
|
|
b6cbd1 |
--- a/ext/standard/info.c
|
|
|
b6cbd1 |
+++ b/ext/standard/info.c
|
|
|
b6cbd1 |
@@ -868,16 +868,16 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
|
|
|
b6cbd1 |
|
|
|
b6cbd1 |
php_info_print_table_start();
|
|
|
b6cbd1 |
php_info_print_table_header(2, "Variable", "Value");
|
|
|
b6cbd1 |
- if (zend_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE) {
|
|
|
b6cbd1 |
+ if (zend_hash_find(&EG(symbol_table), "PHP_SELF", sizeof("PHP_SELF"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
|
|
|
b6cbd1 |
php_info_print_table_row(2, "PHP_SELF", Z_STRVAL_PP(data));
|
|
|
b6cbd1 |
}
|
|
|
b6cbd1 |
- if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE) {
|
|
|
b6cbd1 |
+ if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_TYPE", sizeof("PHP_AUTH_TYPE"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
|
|
|
b6cbd1 |
php_info_print_table_row(2, "PHP_AUTH_TYPE", Z_STRVAL_PP(data));
|
|
|
b6cbd1 |
}
|
|
|
b6cbd1 |
- if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE) {
|
|
|
b6cbd1 |
+ if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_USER", sizeof("PHP_AUTH_USER"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
|
|
|
b6cbd1 |
php_info_print_table_row(2, "PHP_AUTH_USER", Z_STRVAL_PP(data));
|
|
|
b6cbd1 |
}
|
|
|
b6cbd1 |
- if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE) {
|
|
|
b6cbd1 |
+ if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE && Z_TYPE_PP(data) == IS_STRING) {
|
|
|
b6cbd1 |
php_info_print_table_row(2, "PHP_AUTH_PW", Z_STRVAL_PP(data));
|
|
|
b6cbd1 |
}
|
|
|
b6cbd1 |
php_print_gpcse_array(ZEND_STRL("_REQUEST") TSRMLS_CC);
|
|
|
b6cbd1 |
diff --git a/ext/standard/tests/general_functions/bug67498.phpt b/ext/standard/tests/general_functions/bug67498.phpt
|
|
|
b6cbd1 |
new file mode 100644
|
|
|
b6cbd1 |
index 0000000..5b5951b
|
|
|
b6cbd1 |
--- /dev/null
|
|
|
b6cbd1 |
+++ b/ext/standard/tests/general_functions/bug67498.phpt
|
|
|
b6cbd1 |
@@ -0,0 +1,15 @@
|
|
|
b6cbd1 |
+--TEST--
|
|
|
b6cbd1 |
+phpinfo() Type Confusion Information Leak Vulnerability
|
|
|
b6cbd1 |
+--FILE--
|
|
|
b6cbd1 |
+
|
|
|
b6cbd1 |
+$PHP_SELF = 1;
|
|
|
b6cbd1 |
+phpinfo(INFO_VARIABLES);
|
|
|
b6cbd1 |
+
|
|
|
b6cbd1 |
+?>
|
|
|
b6cbd1 |
+==DONE==
|
|
|
b6cbd1 |
+--EXPECTF--
|
|
|
b6cbd1 |
+phpinfo()
|
|
|
b6cbd1 |
+
|
|
|
b6cbd1 |
+PHP Variables
|
|
|
b6cbd1 |
+%A
|
|
|
b6cbd1 |
+==DONE==
|
|
|
b6cbd1 |
--
|
|
|
b6cbd1 |
1.9.2
|
|
|
b6cbd1 |
|