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

Merge "liblog: remove faulty logic in __android_logger_valid_buffer_size" am: 089455f163 am: cb8ddce387

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360177

Change-Id: I77aa0019511037fc50eb41dbf8351f8d0ffa6ea0
This commit is contained in:
Tom Cherry 2020-07-10 20:02:09 +00:00 • committed by Automerger Merge Worker
commit c60efacc4a
1 changed files with 1 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
liblog/properties.cpp
View file

@ -474,36 +474,7 @@ bool __android_logger_property_get_bool(const char* key, int flag) {
}
bool __android_logger_valid_buffer_size(unsigned long value) {
static long pages, pagesize;
unsigned long maximum;
if ((value < LOG_BUFFER_MIN_SIZE) || (LOG_BUFFER_MAX_SIZE < value)) {
return false;
}
if (!pages) {
pages = sysconf(_SC_PHYS_PAGES);
}
if (pages < 1) {
return true;
}
if (!pagesize) {
pagesize = sysconf(_SC_PAGESIZE);
if (pagesize <= 1) {
pagesize = PAGE_SIZE;
}
}
/* maximum memory impact a somewhat arbitrary ~3% */
pages = (pages + 31) / 32;
maximum = pages * pagesize;
if ((maximum < LOG_BUFFER_MIN_SIZE) || (LOG_BUFFER_MAX_SIZE < maximum)) {
return true;
}
return value <= maximum;
return LOG_BUFFER_MIN_SIZE <= value && value <= LOG_BUFFER_MAX_SIZE;
}
struct cache2_property_size {