ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fs_mgr:Add filter condition to make sure that the super block is correct."

Browse source 
am: 9dd1a12b1e

Change-Id: I8947564ee32cd90ea8f3a7c986426b9c3dbd70af
This commit is contained in:
Keun-young Park 2017-07-21 20:11:52 +00:00 • committed by android-build-merger
commit bc4c5032fc
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs_mgr/fs_mgr.cpp
View file

@ -249,6 +249,13 @@ static ext4_fsblk_t ext4_r_blocks_count(const struct ext4_super_block* es) {
le32_to_cpu(es->s_r_blocks_count_lo); le32_to_cpu(es->s_r_blocks_count_lo);
} }
static bool is_ext4_superblock_valid(const struct ext4_super_block* es) {
if (es->s_magic != EXT4_SUPER_MAGIC) return false;
if (es->s_rev_level != EXT4_DYNAMIC_REV && es->s_rev_level != EXT4_GOOD_OLD_REV) return false;
if (EXT4_INODES_PER_GROUP(es) == 0) return false;
return true;
}
// Read the primary superblock from an ext4 filesystem. On failure return // Read the primary superblock from an ext4 filesystem. On failure return
// false. If it's not an ext4 filesystem, also set FS_STAT_EXT4_INVALID_MAGIC. // false. If it's not an ext4 filesystem, also set FS_STAT_EXT4_INVALID_MAGIC.
static bool read_ext4_superblock(const char* blk_device, struct ext4_super_block* sb, int* fs_stat) { static bool read_ext4_superblock(const char* blk_device, struct ext4_super_block* sb, int* fs_stat) {
@ -264,9 +271,8 @@ static bool read_ext4_superblock(const char* blk_device, struct ext4_super_block
return false; return false;
} }
if (sb->s_magic != EXT4_SUPER_MAGIC) { if (!is_ext4_superblock_valid(sb)) {
LINFO << "Invalid ext4 magic:0x" << std::hex << sb->s_magic << " " LINFO << "Invalid ext4 superblock on '" << blk_device << "'";
<< "on '" << blk_device << "'";
// not a valid fs, tune2fs, fsck, and mount will all fail. // not a valid fs, tune2fs, fsck, and mount will all fail.
*fs_stat |= FS_STAT_EXT4_INVALID_MAGIC; *fs_stat |= FS_STAT_EXT4_INVALID_MAGIC;
return false; return false;