Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb472b92 authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "fsmgr: fix integer overflow in fs_mgr" am: be42841c am: 36d60f55... 

Merge "fsmgr: fix integer overflow in fs_mgr" am: be42841c am: 36d60f55 am: 2d66971a am: 6102a34f am: b565e55b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1335698

Change-Id: Ib1b69bf4623f69696cb637b226ec3359fc2ed409
parents 85042ea0 b565e55b

fs_mgr/fs_mgr.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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)) !=