From c9d6c22deda4b526dcf37159be7957c1c38b79e7 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Mon, 17 Nov 2014 17:59:42 -0500 Subject: [PATCH] libext2fs: don't allow alloc_stats on bad inode/block numbers Don't allow callers to feed bad block/inode numbers to ext2fs_*_alloc_stats2, because evil callers (resize2fs) can corrupt library state this way, leading to a crash. (There will be a subsequent patch to resize2fs to fix its bad behavior.) Signed-off-by: Darrick J. Wong Signed-off-by: Theodore Ts'o --- lib/ext2fs/alloc_stats.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ext2fs/alloc_stats.c b/lib/ext2fs/alloc_stats.c index a449dc3..53d990a 100644 --- a/lib/ext2fs/alloc_stats.c +++ b/lib/ext2fs/alloc_stats.c @@ -20,13 +20,13 @@ void ext2fs_inode_alloc_stats2(ext2_filsys fs, ext2_ino_t ino, { int group = ext2fs_group_of_ino(fs, ino); -#ifndef OMIT_COM_ERR if (ino > fs->super->s_inodes_count) { +#ifndef OMIT_COM_ERR com_err("ext2fs_inode_alloc_stats2", 0, "Illegal inode number: %lu", (unsigned long) ino); +#endif return; } -#endif if (inuse > 0) ext2fs_mark_inode_bitmap2(fs->inode_map, ino); else @@ -63,13 +63,13 @@ void ext2fs_block_alloc_stats2(ext2_filsys fs, blk64_t blk, int inuse) { int group = ext2fs_group_of_blk2(fs, blk); -#ifndef OMIT_COM_ERR if (blk >= ext2fs_blocks_count(fs->super)) { +#ifndef OMIT_COM_ERR com_err("ext2fs_block_alloc_stats", 0, "Illegal block number: %lu", (unsigned long) blk); +#endif return; } -#endif if (inuse > 0) ext2fs_mark_block_bitmap2(fs->block_map, blk); else -- 1.8.3.1