commit d4680bb5849d40cc17b577a7dfcc5c6b7a1417fb
author Daeho Jeong <daehojeong@google.com> Tue Mar 28 21:11:18 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 28 21:11:18 2023 +0000
tree 86a845802caa7869f205822f2f167b7138e045b9
parent e828c966e33f96e95b8948900113f07ff68663b6
parent 486c3507fb5b362c6ddd4ef2fe0f128d77d45e5a

Merge "vold: fix write kbytes handling" am: 13a57d2a26 am: 486c3507fb

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2507268

Change-Id: I697ba818c7399584b81c831eb14a8a4d55be7cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

IdleMaint.cpp

diff --git a/IdleMaint.cpp b/IdleMaint.cpp
index 0c6b115..fedfc3d 100644
--- a/IdleMaint.cpp
+++ b/IdleMaint.cpp
@@ -630,7 +630,12 @@
         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;
 }