| commit | 36d60f558143a252b13f25db11b813f36f78ea0e | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Tue Jun 16 17:01:34 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 16 17:01:34 2020 +0000 |
| tree | 7e86a95bddb9fd5399a6f8796ed6c504f55e6293 | |
| parent | f9537f222b907d54e6897bd5dd83520a2f0c45e5 [diff] | |
| parent | be42841c61dc8914f89ef3d900955a3dd4e62388 [diff] |
Merge "fsmgr: fix integer overflow in fs_mgr" am: be42841c61 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1335698 Change-Id: I00164049a8b8e878855ee13f45b596a3cccb1472
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)) !=