libe2p, libext2fs: Update file copyright permission states to match COPYING

[tools/e2fsprogs.git] / lib / ext2fs / openfs.c

diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index 525693e..a6b08c3 100644 (file)
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -1,11 +1,11 @@
 /*
  * openfs.c --- open an ext2 filesystem
- * 
+ *
  * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
- * 
+ *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
@@ -59,10 +59,10 @@ blk_t ext2fs_descriptor_block_loc(ext2_filsys fs, blk_t group_block, dgrp_t i)
 }
 
 errcode_t ext2fs_open(const char *name, int flags, int superblock,
-                     unsigned int block_size, io_manager manager, 
+                     unsigned int block_size, io_manager manager,
                      ext2_filsys *ret_fs)
 {
-       return ext2fs_open2(name, 0, flags, superblock, block_size, 
+       return ext2fs_open2(name, 0, flags, superblock, block_size,
                            manager, ret_fs);
 }
 
@@ -71,7 +71,7 @@ errcode_t ext2fs_open(const char *name, int flags, int superblock,
  *     Superblock and block_size can be zero to use the default size.
  *
  * Valid flags for ext2fs_open()
- * 
+ *
  *     EXT2_FLAG_RW    - Open the filesystem for read/write.
  *     EXT2_FLAG_FORCE - Open the filesystem even if some of the
  *                             features aren't supported.
@@ -79,12 +79,12 @@ errcode_t ext2fs_open(const char *name, int flags, int superblock,
  */
 errcode_t ext2fs_open2(const char *name, const char *io_options,
                       int flags, int superblock,
-                      unsigned int block_size, io_manager manager, 
+                      unsigned int block_size, io_manager manager,
                       ext2_filsys *ret_fs)
 {
        ext2_filsys     fs;
        errcode_t       retval;
-       unsigned long   i;
+       unsigned long   i, first_meta_bg;
        __u32           features;
        int             groups_per_block, blocks_per_group, io_flags;
        blk_t           group_block, blk;
@@ -93,13 +93,13 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
        struct ext2_group_desc *gdp;
        int             j;
 #endif
-       
+
        EXT2_CHECK_MAGIC(manager, EXT2_ET_MAGIC_IO_MANAGER);
 
        retval = ext2fs_get_mem(sizeof(struct struct_ext2_filsys), &fs);
        if (retval)
                return retval;
-       
+
        memset(fs, 0, sizeof(struct struct_ext2_filsys));
        fs->magic = EXT2_ET_MAGIC_EXT2FS_FILSYS;
        fs->flags = flags;
@@ -115,7 +115,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
                *cp++ = 0;
                io_options = cp;
        }
-               
+
        io_flags = 0;
        if (flags & EXT2_FLAG_RW)
                io_flags |= IO_FLAG_RW;
@@ -124,7 +124,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
        retval = manager->open(fs->device_name, io_flags, &fs->io);
        if (retval)
                goto cleanup;
-       if (io_options && 
+       if (io_options &&
            (retval = io_channel_set_options(fs->io, io_options)))
                goto cleanup;
        fs->image_io = fs->io;
@@ -189,7 +189,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
                goto cleanup;
        }
 #endif
-       
+
        if (fs->super->s_magic != EXT2_SUPER_MAGIC) {
                retval = EXT2_ET_BAD_MAGIC;
                goto cleanup;
@@ -231,7 +231,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
                        goto cleanup;
                }
        }
-       
+
        if ((fs->super->s_log_block_size + EXT2_MIN_BLOCK_LOG_SIZE) >
            EXT2_MAX_BLOCK_LOG_SIZE) {
                retval = EXT2_ET_CORRUPT_SUPERBLOCK;
@@ -243,7 +243,7 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
                goto cleanup;
        }
        fs->fragsize = EXT2_FRAG_SIZE(fs->super);
-       fs->inode_blocks_per_group = ((fs->super->s_inodes_per_group *
+       fs->inode_blocks_per_group = ((EXT2_INODES_PER_GROUP(fs->super) *
                                       EXT2_INODE_SIZE(fs->super) +
                                       EXT2_BLOCK_SIZE(fs->super) - 1) /
                                      EXT2_BLOCK_SIZE(fs->super));
@@ -268,20 +268,32 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
                *ret_fs = fs;
                return 0;
        }
-       
+
+       if (EXT2_INODES_PER_GROUP(fs->super) == 0) {
+               retval = EXT2_ET_CORRUPT_SUPERBLOCK;
+               goto cleanup;
+       }
+
        /*
         * Read group descriptors
         */
        blocks_per_group = EXT2_BLOCKS_PER_GROUP(fs->super);
        if (blocks_per_group == 0 ||
            blocks_per_group > EXT2_MAX_BLOCKS_PER_GROUP(fs->super) ||
-           fs->inode_blocks_per_group > EXT2_MAX_INODES_PER_GROUP(fs->super)) {
+           fs->inode_blocks_per_group > EXT2_MAX_INODES_PER_GROUP(fs->super) ||
+           EXT2_DESC_PER_BLOCK(fs->super) == 0 ||
+           fs->super->s_first_data_block >= fs->super->s_blocks_count) {
                retval = EXT2_ET_CORRUPT_SUPERBLOCK;
                goto cleanup;
        }
        fs->group_desc_count = ext2fs_div_ceil(fs->super->s_blocks_count -
                                               fs->super->s_first_data_block,
                                               blocks_per_group);
+       if (fs->group_desc_count * EXT2_INODES_PER_GROUP(fs->super) !=
+           fs->super->s_inodes_count) {
+               retval = EXT2_ET_CORRUPT_SUPERBLOCK;
+               goto cleanup;
+       }
        fs->desc_blocks = ext2fs_div_ceil(fs->group_desc_count,
                                          EXT2_DESC_PER_BLOCK(fs->super));
        retval = ext2fs_get_array(fs->desc_blocks, fs->blocksize,
@@ -292,7 +304,23 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
                group_block = fs->super->s_first_data_block;
        dest = (char *) fs->group_desc;
        groups_per_block = EXT2_DESC_PER_BLOCK(fs->super);
-       for (i=0 ; i < fs->desc_blocks; i++) {
+       if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
+               first_meta_bg = fs->super->s_first_meta_bg;
+       else
+               first_meta_bg = fs->desc_blocks;
+       if (first_meta_bg) {
+               retval = io_channel_read_blk(fs->io, group_block+1,
+                                            first_meta_bg, dest);
+               if (retval)
+                       goto cleanup;
+#ifdef WORDS_BIGENDIAN
+               gdp = (struct ext2_group_desc *) dest;
+               for (j=0; j < groups_per_block*first_meta_bg; j++)
+                       ext2fs_swap_group_desc(gdp++);
+#endif
+               dest += fs->blocksize*first_meta_bg;
+       }
+       for (i=first_meta_bg ; i < fs->desc_blocks; i++) {
                blk = ext2fs_descriptor_block_loc(fs, group_block, i);
                retval = io_channel_read_blk(fs->io, blk, 1, dest);
                if (retval)
@@ -336,7 +364,7 @@ cleanup:
 
 /*
  * Set/get the filesystem data I/O channel.
- * 
+ *
  * These functions are only valid if EXT2_FLAG_IMAGE_FILE is true.
  */
 errcode_t ext2fs_get_data_io(ext2_filsys fs, io_channel *old_io)
@@ -362,7 +390,7 @@ errcode_t ext2fs_rewrite_to_io(ext2_filsys fs, io_channel new_io)
        if ((fs->flags & EXT2_FLAG_IMAGE_FILE) == 0)
                return EXT2_ET_NOT_IMAGE_FILE;
        fs->io = fs->image_io = new_io;
-       fs->flags |= EXT2_FLAG_DIRTY | EXT2_FLAG_RW | 
+       fs->flags |= EXT2_FLAG_DIRTY | EXT2_FLAG_RW |
                EXT2_FLAG_BB_DIRTY | EXT2_FLAG_IB_DIRTY;
        fs->flags &= ~EXT2_FLAG_IMAGE_FILE;
        return 0;