Skip to content

Fix GH-15395: php-fpm: zend_mm_heap corrupted with cgi-fcgi request #16227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix GH-15395: php-fpm: zend_mm_heap corrupted with cgi-fcgi request #16227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions main/SAPI.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,12 +507,15 @@ SAPI_API void sapi_deactivate_module(void)
}
if (SG(request_info).auth_user) {
efree(SG(request_info).auth_user);
SG(request_info).auth_user = NULL;
}
if (SG(request_info).auth_password) {
efree(SG(request_info).auth_password);
SG(request_info).auth_password = NULL;
}
if (SG(request_info).auth_digest) {
efree(SG(request_info).auth_digest);
SG(request_info).auth_digest = NULL;
}
if (SG(request_info).content_type_dup) {
efree(SG(request_info).content_type_dup);
Expand Down
4 changes: 3 additions & 1 deletion main/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2672,7 +2672,9 @@ PHPAPI int php_handle_auth_data(const char *auth)
if (pass) {
*pass++ = '\0';
SG(request_info).auth_user = estrndup(ZSTR_VAL(user), ZSTR_LEN(user));
SG(request_info).auth_password = estrdup(pass);
if (strlen(pass) > 0) {
SG(request_info).auth_password = estrdup(pass);
}
ret = 0;
}
zend_string_free(user);
Expand Down
61 changes: 61 additions & 0 deletions sapi/fpm/tests/gh15395-php-auth-shutdown.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
--TEST--
FPM: GH-15335 - PHP_AUTH shutdown use after free
--SKIPIF--
<?php include "skipif.inc"; ?>
--FILE--
<?php

require_once "tester.inc";

$cfg = <<<EOT
[global]
error_log = {{FILE:LOG}}
log_level = notice
[unconfined]
listen = {{ADDR}}
pm = static
pm.max_children = 1
catch_workers_output = yes
php_admin_value[cgi.fix_pathinfo] = no
EOT;

$code = <<<EOT
<?php
echo \$_SERVER["SCRIPT_NAME"] . "\n";
echo \$_SERVER["SCRIPT_FILENAME"] . "\n";
echo \$_SERVER["PHP_SELF"];
EOT;

$tester = new FPM\Tester($cfg, $code);
[$sourceFilePath, $scriptName] = $tester->createSourceFileAndScriptName();
$tester->start();
$tester->expectLogStartNotices();
$tester
->request(
headers: [ "HTTP_AUTHORIZATION" => "Basic Zm9vOg==", "REQUEST_METHOD" => "GET"],
uri: $scriptName,
address: '{{ADDR}}',
scriptFilename: __DIR__ . "/__unknown.php",
scriptName: "/",
)
->expectStatus('404 Not Found');
$tester
->request(
uri: $scriptName,
address: '{{ADDR}}',
params: [],
);
$tester->expectNoLogPattern("/zend_mm_heap corrupted/");
$tester->terminate();
$tester->expectLogTerminatingNotices();
$tester->close();

?>
Done
--EXPECT--
Done
--CLEAN--
<?php
require_once "tester.inc";
FPM\Tester::clean();
?>
3 changes: 2 additions & 1 deletion sapi/fpm/tests/tester.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,7 @@ class Tester
string|array $stdin = null,
bool $expectError = false,
int $readLimit = -1,
array $params = null,
): Response {
if ($this->hasError()) {
return $this->createResponse(expectInvalid: true);
Expand All @@ -771,7 +772,7 @@ class Tester
$stdin = $this->parseStdin($stdin, $headers);
}

$params = $this->getRequestParams($query, $headers, $uri, $scriptFilename, $scriptName, $stdin);
$params = $params ?? $this->getRequestParams($query, $headers, $uri, $scriptFilename, $scriptName, $stdin);
$this->trace('Request params', $params);

try {
Expand Down
Loading