vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

Convert use of ext2fs_get_mem to ext2fs_get_array for overflow detection 

Add some additional checks, primarily in resize2fs and in the rarely
used (and soon to-be-deprecated) e2fsck byte-swap filesystem function.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
bitmap-optimize
Theodore Ts'o 2007-12-27 10:08:13 -05:00
parent 20ca0f6e40
commit e5aace908e
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2fsck/swapfs.c
View File

@ -119,7 +119,7 @@ static void swap_inodes(e2fsck_t ctx)
e2fsck_use_inode_shortcuts(ctx, 1); e2fsck_use_inode_shortcuts(ctx, 1);
retval = ext2fs_get_mem(fs->blocksize * fs->inode_blocks_per_group, retval = ext2fs_get_array(fs->blocksize, fs->inode_blocks_per_group,
&buf); &buf);
if (retval) { if (retval) {
com_err("swap_inodes", retval, com_err("swap_inodes", retval,

1
lib/ext2fs/ext2fs.h
View File

@ -1019,6 +1019,7 @@ _INLINE_ errcode_t ext2fs_get_mem(unsigned long size, void *ptr)
memcpy(ptr, &pp, sizeof (pp)); memcpy(ptr, &pp, sizeof (pp));
return 0; return 0;
} }
_INLINE_ errcode_t ext2fs_get_array(unsigned long count, unsigned long size, void *ptr) _INLINE_ errcode_t ext2fs_get_array(unsigned long count, unsigned long size, void *ptr)
{ {
if (count && (-1UL)/count<size) if (count && (-1UL)/count<size)

2
resize/extent.c
View File

@ -49,7 +49,7 @@ errcode_t ext2fs_create_extent_table(ext2_extent *ret_extent, int size)
extent->num = 0; extent->num = 0;
extent->sorted = 1; extent->sorted = 1;
retval = ext2fs_get_mem(sizeof(struct ext2_extent_entry) * retval = ext2fs_get_array(sizeof(struct ext2_extent_entry),
extent->size, &extent->list); extent->size, &extent->list);
if (retval) { if (retval) {
ext2fs_free_mem(&extent); ext2fs_free_mem(&extent);

6
resize/resize2fs.c
View File

@ -481,7 +481,7 @@ static errcode_t adjust_superblock(ext2_resize_t rfs, blk_t new_size)
/* /*
* Initialize the new block group descriptors * Initialize the new block group descriptors
*/ */
retval = ext2fs_get_mem(fs->blocksize * fs->inode_blocks_per_group, retval = ext2fs_get_array(fs->blocksize, fs->inode_blocks_per_group,
&rfs->itable_buf); &rfs->itable_buf);
if (retval) if (retval)
goto errout; goto errout;
@ -917,7 +917,7 @@ static errcode_t block_mover(ext2_resize_t rfs)
new_blk = fs->super->s_first_data_block; new_blk = fs->super->s_first_data_block;
if (!rfs->itable_buf) { if (!rfs->itable_buf) {
retval = ext2fs_get_mem(fs->blocksize * retval = ext2fs_get_array(fs->blocksize,
fs->inode_blocks_per_group, fs->inode_blocks_per_group,
&rfs->itable_buf); &rfs->itable_buf);
if (retval) if (retval)
@ -1138,7 +1138,7 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs)
retval = ext2fs_init_dblist(rfs->old_fs, 0); retval = ext2fs_init_dblist(rfs->old_fs, 0);
if (retval) goto errout; if (retval) goto errout;
retval = ext2fs_get_mem(rfs->old_fs->blocksize * 3, &block_buf); retval = ext2fs_get_array(rfs->old_fs->blocksize, 3, &block_buf);
if (retval) goto errout; if (retval) goto errout;
start_to_move = (rfs->new_fs->group_desc_count * start_to_move = (rfs->new_fs->group_desc_count *