Merge "vold: fix write kbytes handling"

1 files changed, 6 insertions, 1 deletions

diff --git a/IdleMaint.cpp b/IdleMaint.cpp
index 0c6b1156..fedfc3d2 100644
--- a/IdleMaint.cpp
+++ b/IdleMaint.cpp
@@ -630,7 +630,12 @@ static int32_t getLifeTimeWrite() {
         return -1;
     }
 
-    long long writeBytes = std::stoll(writeKbytesStr);
+    unsigned long long writeBytes = std::strtoull(writeKbytesStr.c_str(), NULL, 0);
+    /* Careful: values > LLONG_MAX can appear in the file due to a kernel bug. */
+    if (writeBytes / KBYTES_IN_SEGMENT > INT32_MAX) {
+        LOG(WARNING) << "Bad lifetime_write_kbytes: " << writeKbytesStr;
+        return -1;
+    }
     return writeBytes / KBYTES_IN_SEGMENT;
 }