commit eab34c8ad75e4cb2a1b66eb2474c023b79b24b6b
author Elliott Hughes <enh@google.com> Fri Aug 25 14:50:43 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 25 14:50:43 2017 +0000
tree 832e35a65c7db27ea693d10cdbc32e7cf18ef5a5
parent 1ca334b1c4495254bed39adea9934079d5334be5
parent 5da4fe4adaf80c1a5103f739f1ce51de0db795cf

Merge "Fix overflow in get_phys_pages and get_avphys_pages."

libc/bionic/sysinfo.cpp

diff --git a/libc/bionic/sysinfo.cpp b/libc/bionic/sysinfo.cpp
index 304634a..947de95 100644
--- a/libc/bionic/sysinfo.cpp
+++ b/libc/bionic/sysinfo.cpp
@@ -79,11 +79,11 @@
 long get_phys_pages() {
   struct sysinfo si;
   sysinfo(&si);
-  return (si.totalram * si.mem_unit) / sysconf(_SC_PAGE_SIZE);
+  return (static_cast<int64_t>(si.totalram) * si.mem_unit) / PAGE_SIZE;
 }
 
 long get_avphys_pages() {
   struct sysinfo si;
   sysinfo(&si);
-  return ((si.freeram + si.bufferram) * si.mem_unit) / sysconf(_SC_PAGE_SIZE);
+  return ((static_cast<int64_t>(si.freeram) + si.bufferram) * si.mem_unit) / PAGE_SIZE;
 }