Skip to content

Commit

Permalink
Fix #73809: Phar Zip parse crash - mmap fail
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
cmb69 committed Dec 1, 2020
1 parent ecee3f1 commit c283f53
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ PHP NEWS
. Fixed bug #80368 (OpenSSL extension fails to build against LibreSSL due to
lack of OCB support). (Nikita)

- Phar:
. Fixed bug #73809 (Phar Zip parse crash - mmap fail). (cmb)

- Phpdbg:
. Fixed bug #76813 (Access violation near NULL on source operand). (cmb)

Expand Down
30 changes: 30 additions & 0 deletions ext/phar/tests/bug73809.phpt
Original file line number Diff line number Diff line change
@@ -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"
7 changes: 6 additions & 1 deletion ext/phar/zip.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,13 @@ int phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alia
char *sig;
size_t sig_len;

php_stream_tell(fp);
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();
if (!sigfile) {
PHAR_ZIP_FAIL("couldn't open temporary file");
Expand Down

0 comments on commit c283f53

Please sign in to comment.