diff options
| author | Tianjie Xu <xunchang@google.com> | 2017-04-05 14:46:27 -0700 |
|---|---|---|
| committer | MSe <mse1969@posteo.de> | 2017-06-09 15:12:12 +0200 |
| commit | 4f84775fef93119cb80be7bd93b6bfaf8c02b192 (patch) | |
| tree | fb2e61226499014b815b1cf80ab88edd488a755f | |
| parent | b2be6abc675348fb2ea24eaa84b320dfa21f2df8 (diff) | |
| download | system_core-4f84775fef93119cb80be7bd93b6bfaf8c02b192.tar.gz system_core-4f84775fef93119cb80be7bd93b6bfaf8c02b192.tar.bz2 system_core-4f84775fef93119cb80be7bd93b6bfaf8c02b192.zip | |
Fix out of bound read in libziparchive
We should check the boundary of central directory before checking its
signature. Swap the order of these two checks.
Bug: 36392138
Test: libziparchive doesn't read the signature after boundary check fails.
AOSP-Change-Id: Ie89f709bb2d1ccb647116fb7ccb1e23c943e5ab8
(cherry picked from commit 74464a1361562d4042a67c5d66bfcf396ee7e59c)
(cherry picked from commit d9fd1863f46d5185eaaebc0803ee9c5da3ef110b)
CVE-2017-0647
Change-Id: I85baf2536b682cd91fb13b530af76dc15dd48326
| -rw-r--r-- | libziparchive/zip_archive.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc index a17091f95..8c2c559b1 100644 --- a/libziparchive/zip_archive.cc +++ b/libziparchive/zip_archive.cc @@ -580,6 +580,14 @@ static int32_t ParseZipArchive(ZipArchive* archive) { const uint8_t* const cd_end = cd_ptr + cd_length; const uint8_t* ptr = cd_ptr; for (uint16_t i = 0; i < num_entries; i++) { + if (ptr > cd_end - sizeof(CentralDirectoryRecord)) { + ALOGW("Zip: ran off the end (at %" PRIu16 ")", i); +#if defined(__ANDROID__) + android_errorWriteLog(0x534e4554, "36392138"); +#endif + return -1; + } + const CentralDirectoryRecord* cdr = reinterpret_cast<const CentralDirectoryRecord*>(ptr); if (cdr->record_signature != CentralDirectoryRecord::kSignature) { @@ -587,11 +595,6 @@ static int32_t ParseZipArchive(ZipArchive* archive) { return -1; } - if (ptr + sizeof(CentralDirectoryRecord) > cd_end) { - ALOGW("Zip: ran off the end (at %" PRIu16 ")", i); - return -1; - } - const off64_t local_header_offset = cdr->local_file_header_offset; if (local_header_offset >= archive->directory_offset) { ALOGW("Zip: bad LFH offset %" PRId64 " at entry %" PRIu16, |