Merge "vold: fix write kbytes handling"

This commit is contained in:
Daeho Jeong 2023-03-28 20:15:53 +00:00 committed by Gerrit Code Review
commit 13a57d2a26

View file

@ -630,7 +630,12 @@ static int32_t getLifeTimeWrite() {
return -1; 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; return writeBytes / KBYTES_IN_SEGMENT;
} }