diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2018-05-30 12:17:01 -0700 |
|---|---|---|
| committer | Ryan Longair <rlongair@google.com> | 2018-06-12 11:14:52 -0700 |
| commit | d33e25ebc5ede60ead3916aeba9e01228fb9e197 (patch) | |
| tree | 1e7404134086c4579c55cb9ab914235024af1695 | |
| parent | a8faaefba2aee4df0673014dbc4c263d1c6d9ad1 (diff) | |
| download | base-d33e25ebc5ede60ead3916aeba9e01228fb9e197.tar.gz | |
Fix DynamicRefTable::load security bug
DynamicRefTables parsed from apks are missing bounds checks that prevent
buffer overflows. This changes verifies the bounds of the header before
attempting to preform operations on the chunk.
Bug: 79488511
Test: run cts -m CtsAppSecurityHostTestCases \
-t android.appsecurity.cts.CorruptApkTests
Change-Id: I02c8ad957da244fce777ac68a482e4e8fa70f846
Merged-In: I02c8ad957da244fce777ac68a482e4e8fa70f846
(cherry picked from commit 8cf0f988b0c64bcf2c199bb76439c51c257dd162)
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index e004fc055b86..65588b2fafc4 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -6415,8 +6415,16 @@ status_t ResTable::parsePackage(const ResTable_package* const pkg, } } else if (ctype == RES_TABLE_LIBRARY_TYPE) { + if (group->dynamicRefTable.entries().size() == 0) { - status_t err = group->dynamicRefTable.load((const ResTable_lib_header*) chunk); + const ResTable_lib_header* lib = (const ResTable_lib_header*) chunk; + status_t err = validate_chunk(&lib->header, sizeof(*lib), + endPos, "ResTable_lib_header"); + if (err != NO_ERROR) { + return (mError=err); + } + + err = group->dynamicRefTable.load(lib); if (err != NO_ERROR) { return (mError=err); } |