korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-28 20:44:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

libext2fs: Fix resize inode creation with non-standard s_first_data_block

Browse Source 
Thanks to Max Lindner (lokimuh) for pointing this out.

   I'm playing around a bit with ext2 and multi-user encryption and I
   need space for my key management. So I set s_first_data_block to 4000
   or something like that.

   This way mke2fs segfaults when executing
   ext2fs_create_resize_inode() because

   blk_t goal = 3 + sb->s_reserved_gdt_blocks + fs->desc_blocks +
   fs->inode_blocks_per_group;

   will produce a integer underrun later and segfault then in the
   ext2fs_test_bit assembler inline function.

   when exchanging 3 with 2 + sb->s_first_data_block, mke2fs does not
   segfault.

   I'm not 100% sure if thats the correct way dealing with this issue
   but I think its a proper solution.

Addresses-Sourceforge-Bug: #1935847

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2008-04-06 17:00:23 -04:00
parent 283986cafe
commit 52bb0b050a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ext2fs/res_gdt.c
View File

@ -93,8 +93,9 @@ errcode_t ext2fs_create_resize_inode(ext2_filsys fs)
if (retval)
goto out_inode;
} else {
blk_t goal = 3 + sb->s_reserved_gdt_blocks +
fs->desc_blocks + fs->inode_blocks_per_group;
blk_t goal = sb->s_first_data_block + fs->desc_blocks +
sb->s_reserved_gdt_blocks + 2 +
fs->inode_blocks_per_group;
retval = ext2fs_alloc_block(fs, goal, 0, &dindir_blk);
if (retval)