diff options
| author | Tom Cherry <tomcherry@google.com> | 2020-06-16 16:54:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-06-16 16:54:48 +0000 |
| commit | c9969f05120e26ca86d882a63e886cedd09aa71f (patch) | |
| tree | 7e86a95bddb9fd5399a6f8796ed6c504f55e6293 | |
| parent | 749e48c6a5675842df9426b95f146bcae0fef5d5 (diff) | |
| parent | bf43d6fed293498e4f8684aa64aa97e1e81f697b (diff) | |
Merge "fsmgr: fix integer overflow in fs_mgr"
| -rw-r--r-- | fs_mgr/fs_mgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index 76837eeb1d..0c184af36e 100644 --- a/fs_mgr/fs_mgr.cpp +++ b/fs_mgr/fs_mgr.cpp @@ -331,7 +331,7 @@ static bool read_ext4_superblock(const std::string& blk_device, const FstabEntry // 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)) != |