ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fail explicitly on length overflow." into oc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2020-07-31 19:24:50 +00:00 • committed by Android (Google) Code Review
commit ea8d38e77f
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libutils/FileMap.cpp
View file

@ -182,6 +182,10 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le
adjust = offset % mPageSize; adjust = offset % mPageSize;
adjOffset = offset - adjust; adjOffset = offset - adjust;
adjLength = length + adjust; adjLength = length + adjust;
if (__builtin_add_overflow(length, adjust, &adjLength)) {
ALOGE("adjusted length overflow: length %zu adjust %d", length, adjust);
return false;
}
flags = MAP_SHARED; flags = MAP_SHARED;
prot = PROT_READ; prot = PROT_READ;