From: Kit Westneat Date: Mon, 2 Dec 2013 19:47:08 +0000 (-0500) Subject: libext2fs: set the fs block size to new_io in ext2fs_rewrite_to_io() X-Git-Tag: v1.42.9~110 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b3c52fb8115c8c37835d74455619f380acbc833;p=thirdparty%2Fe2fsprogs.git libext2fs: set the fs block size to new_io in ext2fs_rewrite_to_io() e2image manually opens a new IO channel, and then sets the file system to use this new IO channel via ext2fs_rewrite+to_io(). We need to make sure the IO channel is set to the file system's block size to avoid some nasty buffer overruns. [ Modified by tytso to use io_channel_set_blksize() ] Signed-off-by: Kit Westneat Signed-off-by: "Theodore Ts'o" Reviewed-by: Andreas Dilger --- diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c index 9fe1645db..c38b58639 100644 --- a/lib/ext2fs/openfs.c +++ b/lib/ext2fs/openfs.c @@ -451,8 +451,13 @@ errcode_t ext2fs_set_data_io(ext2_filsys fs, io_channel new_io) errcode_t ext2fs_rewrite_to_io(ext2_filsys fs, io_channel new_io) { + errcode_t err; + if ((fs->flags & EXT2_FLAG_IMAGE_FILE) == 0) return EXT2_ET_NOT_IMAGE_FILE; + err = io_channel_set_blksize(new_io, fs->blocksize); + if (err) + return err; fs->io = fs->image_io = new_io; fs->flags |= EXT2_FLAG_DIRTY | EXT2_FLAG_RW | EXT2_FLAG_BB_DIRTY | EXT2_FLAG_IB_DIRTY;