commit be42841c61dc8914f89ef3d900955a3dd4e62388
author Tom Cherry <tomcherry@google.com> Tue Jun 16 16:54:48 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 16 16:54:48 2020 +0000
tree 7e86a95bddb9fd5399a6f8796ed6c504f55e6293
parent a5032be8e097263ec82967ad6fdf40e1061a33e7
parent 4a489450f4698b44a6464aab913c8e86ca5cb158

Merge "fsmgr: fix integer overflow in fs_mgr"

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 76837ee..0c184af 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -331,7 +331,7 @@
             // try backup superblock, if main superblock is corrupted
             for (unsigned int blocksize = EXT4_MIN_BLOCK_SIZE; blocksize <= EXT4_MAX_BLOCK_SIZE;
                  blocksize *= 2) {
-                unsigned int superblock = blocksize * 8;
+                uint64_t superblock = blocksize * 8;
                 if (blocksize == EXT4_MIN_BLOCK_SIZE) superblock++;
 
                 if (TEMP_FAILURE_RETRY(pread(fd, sb, sizeof(*sb), superblock * blocksize)) !=