Fix incorrect check of descsz value. am: d917514bd6

am: 69406d904a

* commit '69406d904abffcfd5addf14dc96584f73ab04ff5':
  Fix incorrect check of descsz value.
This commit is contained in:
Christopher Ferris 2015-10-29 19:20:52 +00:00 committed by android-build-merger
commit 3f5fdc3522
1 changed files with 4 additions and 4 deletions

View File

@ -63,10 +63,10 @@ static bool get_build_id(
if (nhdr.n_type == NT_GNU_BUILD_ID) {
// Skip the name (which is the owner and should be "GNU").
addr += NOTE_ALIGN(nhdr.n_namesz);
uint8_t build_id_data[128];
if (nhdr.n_namesz > sizeof(build_id_data)) {
ALOGE("Possible corrupted note, name size value is too large: %u",
nhdr.n_namesz);
uint8_t build_id_data[160];
if (nhdr.n_descsz > sizeof(build_id_data)) {
ALOGE("Possible corrupted note, desc size value is too large: %u",
nhdr.n_descsz);
return false;
}
if (backtrace->Read(addr, build_id_data, nhdr.n_descsz) != nhdr.n_descsz) {