commit eb8079e656f8f79e959e844b17a7115be6e5dd9d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 24 05:35:50 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 24 05:35:50 2023 +0000
tree 260acddacc5f9565bd536ccc377b63bc1e664e11
parent 5efd90644ba41d5253bcbe87659f0ec68af6b37f
parent 702a779edb5d71d9f1be82713482a51ff69a8a3d

Merge "Fix overflow issue when computing ideal size of scratch partition"

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index ef436e5..f04fc8d 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -1083,7 +1083,7 @@
         return 0;
     }
 
-    auto ideal_size = std::min(super_info.size, uint64_t(s.f_frsize * s.f_bfree * 0.85));
+    auto ideal_size = std::min(super_info.size, uint64_t(uint64_t(s.f_frsize) * s.f_bfree * 0.85));
 
     // Align up to the filesystem block size.
     if (auto remainder = ideal_size % s.f_bsize; remainder > 0) {