commit cb8ddce387c038ccf75296a10975b39a7f22e359
author Tom Cherry <tomcherry@google.com> Fri Jul 10 19:40:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 10 19:40:53 2020 +0000
tree e8ecff6f1369c1152b8c56395988e225c1133154
parent 9c590e4c97a9594efd78a7409af1d3a84b652841
parent 089455f163377ac6322815b257818eaca76635bd

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

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

Change-Id: Iea70205318f7dda34db469fa4d1563a85128c81e

liblog/properties.cpp

diff --git a/liblog/properties.cpp b/liblog/properties.cpp
index f5e060c..2392112 100644
--- a/liblog/properties.cpp
+++ b/liblog/properties.cpp
@@ -474,36 +474,7 @@
 }
 
 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 {