com php-src: Merge branch 'PHP-7.1' into PHP-7.2: sapi/fpm/fpm/ fpm_main.c sapi/fpm/tests/bug78599-path-info-un derflow.phpt sapi/fpm/tests/tester.inc

From: Date: Tue, 22 Oct 2019 07:34:42 +0000
Subject: com php-src: Merge branch 'PHP-7.1' into PHP-7.2: sapi/fpm/fpm/ fpm_main.c sapi/fpm/tests/bug78599-path-info-un derflow.phpt sapi/fpm/tests/tester.inc
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-108991@lists.php.net to get a copy of this message
Commit: 7a990257a05c725d53ca91bc9d080c99102f4e5e Author: Stanislav Malyshev <stas@php.net> Mon, 21 Oct 2019 13:17:09 -0700 Committer: Remi Collet <remi@php.net> Tue, 22 Oct 2019 09:34:42 +0200 Parents: 4104bc908e2fa8cab5d751a995b608a67cda183e Branches: PHP-7.2.24 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7a990257a05c725d53ca91bc9d080c99102f4e5e Log: Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) bump versions after release set versions for release Bugs: https://bugs.php.net/78599 Changed paths: M sapi/fpm/fpm/fpm_main.c A sapi/fpm/tests/bug78599-path-info-underflow.phpt M sapi/fpm/tests/tester.inc Diff: diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index f0cc3a07a48..b0e6226d9ad 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1209,8 +1209,8 @@ static void init_request_info(void) path_info = script_path_translated + ptlen; tflag = (slen != 0 && (!orig_path_info || strcmp(orig_path_info, path_info) != 0)); } else { - path_info = env_path_info ? env_path_info + pilen - slen : NULL; - tflag = (orig_path_info != path_info); + path_info = (env_path_info && pilen > slen) ? env_path_info + pilen - slen : NULL; + tflag = path_info && (orig_path_info != path_info); } if (tflag) { diff --git a/sapi/fpm/tests/bug78599-path-info-underflow.phpt b/sapi/fpm/tests/bug78599-path-info-underflow.phpt new file mode 100644 index 00000000000..edd4e0d4969 --- /dev/null +++ b/sapi/fpm/tests/bug78599-path-info-underflow.phpt @@ -0,0 +1,61 @@ +--TEST-- +FPM: bug78599 - env_path_info underflow - CVE-2019-11043 +--SKIPIF-- +<?php include "skipif.inc"; ?> +--FILE-- +<?php + +require_once "tester.inc"; + +$cfg = <<<EOT +[global] +error_log = {{FILE:LOG}} +[unconfined] +listen = {{ADDR}} +pm = dynamic +pm.max_children = 5 +pm.start_servers = 1 +pm.min_spare_servers = 1 +pm.max_spare_servers = 3 +EOT; + +$code = <<<EOT +<?php +echo "Test Start\n"; +var_dump(\$_SERVER["PATH_INFO"]); +echo "Test End\n"; +EOT; + +$tester = new FPM\Tester($cfg, $code); +$tester->start(); +$tester->expectLogStartNotices(); +$uri = $tester->makeSourceFile(); +$tester + ->request( + '', + [ + 'SCRIPT_FILENAME' => $uri . "/" . str_repeat('A', 35), + 'PATH_INFO' => '', + 'HTTP_HUI' => str_repeat('PTEST', 1000), + ], + $uri + ) + ->expectBody( + [ + 'Test Start', + 'string(0) ""', + 'Test End' + ] + ); +$tester->terminate(); +$tester->close(); + +?> +Done +--EXPECT-- +Done +--CLEAN-- +<?php +require_once "tester.inc"; +FPM\Tester::clean(); +?> diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc index 70c03ad70f1..3b6702866cc 100644 --- a/sapi/fpm/tests/tester.inc +++ b/sapi/fpm/tests/tester.inc @@ -513,7 +513,7 @@ class Tester return new Response(null, true); } if (is_null($uri)) { - $uri = $this->makeFile('src.php', $this->code); + $uri = $this->makeSourceFile(); } $params = array_merge( @@ -538,7 +538,6 @@ class Tester ], $headers ); - try { $this->response = new Response( $this->getClient($address, $connKeepAlive)->request_data($params, false) @@ -945,6 +944,14 @@ class Tester } /** + * @return string + */ + public function makeSourceFile() + { + return $this->makeFile('src.php', $this->code); + } + + /** * @param string|null $msg */ private function message($msg)

« previous php.cvs (#108991) next »