| commit | 2d66971a8eac18f5d268a19fcf4ff174869b00ae | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Tue Jun 16 17:13:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 16 17:13:30 2020 +0000 |
| tree | f615f7b649a4e07cc37ada4eeb8be91cb5eff266 | |
| parent | 620a7053c5f6b8f7c7c0bc6bafc5fe187956ca50 [diff] | |
| parent | 36d60f558143a252b13f25db11b813f36f78ea0e [diff] |
Merge "fsmgr: fix integer overflow in fs_mgr" am: be42841c61 am: 36d60f5581 Original change: https://android-review.googlesource.com/c/platform/system/core/+/1335698 Change-Id: I983248e8cb987130f4515fcb62052deb74e62a67
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index 325afc0..96476f7 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)) !=