Add checks for fs->blocksize == 0 which could cause some crashes

This should never happeb, but some checks is useful, and also fixes
some Coverity warnings.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debugfs/do_journal.c b/debugfs/do_journal.c
index a49bc369a1a256b2385adeb71f2264291f9ebcd8..38439c692da6cf75f623fa845a3db331f1eda58a 100644 (file)
--- a/debugfs/do_journal.c
+++ b/debugfs/do_journal.c
@@ -530,8 +530,6 @@ static errcode_t journal_write(journal_t *journal,
        }
 
        err = journal_close_trans(&trans);
-       if (err)
-               goto error;
 error:
        return err;
 }

diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c
index 86184b68269ed23c78c4ec8c3f8f1329bf828bf3..da32d942b1486359b879549b4352c7a449edce60 100644 (file)
--- a/lib/ext2fs/csum.c
+++ b/lib/ext2fs/csum.c
@@ -263,6 +263,9 @@ static errcode_t __get_dirent_tail(ext2_filsys fs,
        errcode_t retval = 0;
        __u16 (*translate)(__u16) = (need_swab ? disk_to_host16 : do_nothing16);
 
+       if (fs->blocksize < 1024)
+               return EXT2_FILSYS_CORRUPTED; /* Should never happen */
+
        d = dirent;
        top = EXT2_DIRENT_TAIL(dirent, fs->blocksize);
 

diff --git a/lib/ext2fs/ext2_err.et.in b/lib/ext2fs/ext2_err.et.in
index 0c76fee6424862375e9c293c2f2c2c5972907b5a..cf0e00ea314fb6c0c682a7834d0fb1a08f026a45 100644 (file)
--- a/lib/ext2fs/ext2_err.et.in
+++ b/lib/ext2fs/ext2_err.et.in
@@ -548,4 +548,7 @@ ec  EXT2_ET_EA_INODE_CORRUPTED,
 ec     EXT2_ET_NO_GDESC,
        "Group descriptors not loaded"
 
+ec     EXT2_FILSYS_CORRUPTED,
+       "The internal ext2_filsys data structure appears to be corrupted"
+
        end

diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c
index c4377eeba9cae4d7a78481d244b4820051e8022f..6f42882ea59116d51c9876e1de93fddd3d789c4d 100644 (file)
--- a/lib/ext2fs/inode.c
+++ b/lib/ext2fs/inode.c
@@ -144,6 +144,8 @@ errcode_t ext2fs_open_inode_scan(ext2_filsys fs, int buffer_blocks,
        errcode_t (*save_get_blocks)(ext2_filsys f, ext2_ino_t ino, blk_t *blocks);
 
        EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
+       if (fs->blocksize < 1024)
+               return EXT2_FILSYS_CORRUPTED; /* Should never happen */
 
        /*
         * If fs->badblocks isn't set, then set it --- since the inode
@@ -764,6 +766,8 @@ errcode_t ext2fs_read_inode2(ext2_filsys fs, ext2_ino_t ino,
        int             cache_slot, fail_csum;
 
        EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
+       if (fs->blocksize < 1024)
+               return EXT2_FILSYS_CORRUPTED; /* Should never happen */
 
        /* Check to see if user has an override function */
        if (fs->read_inode &&

diff --git a/misc/e2image.c b/misc/e2image.c
index 90a34bebc36da4ad2de3cc7efb36663d06d6806e..347759b219771335acce728e9c91e37537e543b8 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -897,8 +897,9 @@ static errcode_t initialize_qcow2_image(int fd, ext2_filsys fs,
        int cluster_bits = get_bits_from_size(fs->blocksize);
        struct ext2_super_block *sb = fs->super;
 
-       if (fs->blocksize < 1024)
-               return EINVAL;  /* Can never happen, but just in case... */
+       /* Sbould never happen, but just in case... */
+       if (cluster_bits < 0)
+               return EXT2_FILSYS_CORRUPTED;
 
        /* Allocate header */
        ret = ext2fs_get_memzero(sizeof(struct ext2_qcow2_hdr), &header);