Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c99887ba authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "liblog: remove faulty logic in __android_logger_valid_buffer_size" am:... 

Merge "liblog: remove faulty logic in __android_logger_valid_buffer_size" am: 089455f1 am: cb8ddce3 am: c60efacc

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

Change-Id: I998009d2d8bb0dbeff730970f123f7662851c0e5
parents e29a9a69 c60efacc

liblog/properties.cpp

+1 −30
Original line number Diff line number Diff line
@@ -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 {