Fix #73809: Phar Zip parse crash - mmap fail

Phar signatures practically are of limited size; for the MD5 and SHA
hashes the size is fixed (at most 64 bytes for SHA512); for OpenSSL
public keys there is no size limit in theory, but "64 KiB ought to be
good enough for anybody".  So we check for that limit, to avoid fatal
errors due to out of memory conditions.

Since it is neither possible to have the signature compressed in the
ZIP archive, nor is it possible to manually add a signature via Phar,
we use ZipArchive to create a suitable archive for the test on the fly.

Closes GH-6474.
This commit is contained in:
Christoph M. Becker 2020-12-01 14:20:39 +01:00
parent ecee3f1209
commit c283f53b24
3 changed files with 39 additions and 1 deletions

3
NEWS
View file

@ -24,6 +24,9 @@ PHP NEWS
. Fixed bug #80368 (OpenSSL extension fails to build against LibreSSL due to . Fixed bug #80368 (OpenSSL extension fails to build against LibreSSL due to
lack of OCB support). (Nikita) lack of OCB support). (Nikita)
- Phar:
. Fixed bug #73809 (Phar Zip parse crash - mmap fail). (cmb)
- Phpdbg: - Phpdbg:
. Fixed bug #76813 (Access violation near NULL on source operand). (cmb) . Fixed bug #76813 (Access violation near NULL on source operand). (cmb)

View file

@ -0,0 +1,30 @@
--TEST--
Bug #73809 (Phar Zip parse crash - mmap fail)
--SKIPIF--
<?php
if (!extension_loaded('phar')) die('skip phar extension not available');
if (!extension_loaded('zip')) die('skip zip extension not available');
?>
--FILE--
<?php
// create the ZIP to be tested
$zip = new ZipArchive;
$zip->open(__DIR__ . '/73809.zip', ZipArchive::CREATE);
$zip->addFromString('73809.txt', 'yada yada');
$zip->addFromString('.phar/signature.bin', str_repeat('*', 64 * 1024 + 1));
$zip->setCompressionName('.phar/signature.bin', ZipArchive::CM_STORE);
var_dump($zip->close());
try {
$phar = new PharData(__DIR__ . '/73809.zip');
} catch (Exception $ex) {
echo $ex->getMessage(), PHP_EOL;
}
?>
--CLEAN--
<?php
@unlink(__DIR__ . '/73809.zip');
?>
--EXPECTF--
bool(true)
phar error: signatures larger than 64 KiB are not supported in zip-based phar "%s"

View file

@ -405,8 +405,13 @@ foundit:
char *sig; char *sig;
size_t sig_len; size_t sig_len;
php_stream_tell(fp);
pefree(entry.filename, entry.is_persistent); pefree(entry.filename, entry.is_persistent);
if (entry.uncompressed_filesize > 0x10000) {
PHAR_ZIP_FAIL("signatures larger than 64 KiB are not supported");
}
php_stream_tell(fp);
sigfile = php_stream_fopen_tmpfile(); sigfile = php_stream_fopen_tmpfile();
if (!sigfile) { if (!sigfile) {
PHAR_ZIP_FAIL("couldn't open temporary file"); PHAR_ZIP_FAIL("couldn't open temporary file");