diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2013-12-12 13:10:29 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-12-12 13:10:31 -0500 |
| commit | 6908c0c391af248854b892737c92a7a678a24f66 (patch) | |
| tree | 5b380dc7f813c66ea585d376ebbbaa571c430c8f /misc/dumpe2fs.c | |
| parent | b3993825860a3c89fe2e66ab74dc59ab65be99c9 (diff) | |
| download | e2fsprogs-6908c0c391af248854b892737c92a7a678a24f66.tar.gz | |
dumpe2fs: check return values
Check the return values from ext2fs_get_block_bitmap_range2(); if an
error happened, print that and don't print garbage bitmap.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'misc/dumpe2fs.c')
| -rw-r--r-- | misc/dumpe2fs.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c index 2464100e..d0ea6c34 100644 --- a/misc/dumpe2fs.c +++ b/misc/dumpe2fs.c @@ -162,6 +162,7 @@ static void list_desc (ext2_filsys fs) int has_super; blk64_t blk_itr = EXT2FS_B2C(fs, fs->super->s_first_data_block); ext2_ino_t ino_itr = 1; + errcode_t retval; if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, EXT4_FEATURE_RO_COMPAT_BIGALLOC)) @@ -256,21 +257,30 @@ static void list_desc (ext2_filsys fs) ext2fs_bg_itable_unused(fs, i)); if (block_bitmap) { fputs(_(" Free blocks: "), stdout); - ext2fs_get_block_bitmap_range2(fs->block_map, + retval = ext2fs_get_block_bitmap_range2(fs->block_map, blk_itr, block_nbytes << 3, block_bitmap); - print_free(i, block_bitmap, - fs->super->s_clusters_per_group, - fs->super->s_first_data_block, - EXT2FS_CLUSTER_RATIO(fs)); + if (retval) + com_err("list_desc", retval, + "while reading block bitmap"); + else + print_free(i, block_bitmap, + fs->super->s_clusters_per_group, + fs->super->s_first_data_block, + EXT2FS_CLUSTER_RATIO(fs)); fputc('\n', stdout); blk_itr += fs->super->s_clusters_per_group; } if (inode_bitmap) { fputs(_(" Free inodes: "), stdout); - ext2fs_get_inode_bitmap_range2(fs->inode_map, + retval = ext2fs_get_inode_bitmap_range2(fs->inode_map, ino_itr, inode_nbytes << 3, inode_bitmap); - print_free(i, inode_bitmap, - fs->super->s_inodes_per_group, 1, 1); + if (retval) + com_err("list_desc", retval, + "while reading inode bitmap"); + else + print_free(i, inode_bitmap, + fs->super->s_inodes_per_group, + 1, 1); fputc('\n', stdout); ino_itr += fs->super->s_inodes_per_group; } |