openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Tom Cherry 2020-06-16 17:01:34 +00:00 committed by Automerger Merge Worker
parent f9537f222b be42841c61
commit 36d60f5581
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs_mgr/fs_mgr.cpp
View File

@ -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)) !=