| commit | ef125d890b4d7588a1a413aefbc98a78253ecbf6 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Wed Jun 17 00:18:47 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 17 00:18:47 2020 +0000 |
| tree | 20c5c1376f4b5a1793a729bc23828e74f8387c7d | |
| parent | 25ec88f2a764dc4bf0c211f182b0cbd5aa02d077 [diff] | |
| parent | 4f381f70ad4174e7db247a90277bb4ba593b4a52 [diff] |
fsmgr: fix integer overflow in fs_mgr am: e28dc48de5 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11882481 Change-Id: I4af65dffeac85cb43e33929451029073b40151b1
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index 1c5bb6c..22d1284 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)) !=