FIX: item->in_inode is not initialized.

[lwext4.git] / lwext4 / ext4_ialloc.c

diff --git a/lwext4/ext4_ialloc.c b/lwext4/ext4_ialloc.c
index 1cf8a2df26bd30b8170272cff40d185ce75709e5..c10c0f46a9ef6f4a7640bc625df301a18cb3fc8b 100644 (file)
--- a/lwext4/ext4_ialloc.c
+++ b/lwext4/ext4_ialloc.c
@@ -86,38 +86,40 @@ static uint32_t ext4_ialloc_get_bgid_of_inode(struct ext4_sblock *sb,
        return (inode - 1) / inodes_per_group;
 }
 
+#if CONFIG_META_CSUM_ENABLE
 static uint32_t ext4_ialloc_bitmap_csum(struct ext4_sblock *sb,
                                        void *bitmap)
 {
        uint32_t checksum = 0;
-       if (ext4_sb_has_feature_read_only(sb,
-                               EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
+       if (ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_METADATA_CSUM)) {
                uint32_t inodes_per_group =
                        ext4_get32(sb, inodes_per_group);
 
                /* First calculate crc32 checksum against fs uuid */
-               checksum = ext4_crc32c(~0, sb->uuid, sizeof(sb->uuid));
+               checksum = ext4_crc32c(EXT4_CRC32_INIT, sb->uuid,
+                               sizeof(sb->uuid));
                /* Then calculate crc32 checksum against inode bitmap */
                checksum = ext4_crc32c(checksum, bitmap,
                                     (inodes_per_group + 7) / 8);
        }
        return checksum;
 }
-
-/*
- * BIG FAT NOTES:
- *       Currently we do not verify the checksum of bitmaps.
- */
+#else
+#define ext4_ialloc_bitmap_csum(...) 0
+#endif
 
 void ext4_ialloc_set_bitmap_csum(struct ext4_sblock *sb,
                                 struct ext4_bgroup *bg,
-                                void *bitmap)
+                                void *bitmap __unused)
 {
        int desc_size = ext4_sb_get_desc_size(sb);
        uint32_t checksum = ext4_ialloc_bitmap_csum(sb, bitmap);
        uint16_t lo_checksum = to_le16(checksum & 0xFFFF),
                 hi_checksum = to_le16(checksum >> 16);
        
+       if (!ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_METADATA_CSUM))
+               return;
+
        /* See if we need to assign a 32bit checksum */
        bg->inode_bitmap_csum_lo = lo_checksum;
        if (desc_size == EXT4_MAX_BLOCK_GROUP_DESCRIPTOR_SIZE)
@@ -125,6 +127,34 @@ void ext4_ialloc_set_bitmap_csum(struct ext4_sblock *sb,
 
 }
 
+#if CONFIG_META_CSUM_ENABLE
+static bool
+ext4_ialloc_verify_bitmap_csum(struct ext4_sblock *sb,
+                              struct ext4_bgroup *bg,
+                              void *bitmap __unused)
+{
+
+       int desc_size = ext4_sb_get_desc_size(sb);
+       uint32_t checksum = ext4_ialloc_bitmap_csum(sb, bitmap);
+       uint16_t lo_checksum = to_le16(checksum & 0xFFFF),
+                hi_checksum = to_le16(checksum >> 16);
+
+       if (!ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_METADATA_CSUM))
+               return true;
+       
+       if (bg->inode_bitmap_csum_lo != lo_checksum)
+               return false;
+
+       if (desc_size == EXT4_MAX_BLOCK_GROUP_DESCRIPTOR_SIZE)
+               if (bg->inode_bitmap_csum_hi != hi_checksum)
+                       return false;
+
+       return true;
+}
+#else
+#define ext4_ialloc_verify_bitmap_csum(...) true
+#endif
+
 int ext4_ialloc_free_inode(struct ext4_fs *fs, uint32_t index, bool is_dir)
 {
        struct ext4_sblock *sb = &fs->sb;
@@ -146,6 +176,15 @@ int ext4_ialloc_free_inode(struct ext4_fs *fs, uint32_t index, bool is_dir)
        if (rc != EOK)
                return rc;
 
+       if (!ext4_ialloc_verify_bitmap_csum(sb,
+                              bg_ref.block_group,
+                              bitmap_block.data)) {
+               ext4_dbg(DEBUG_IALLOC,
+                       DBG_WARN "Bitmap checksum failed."
+                       "Group: %" PRIu32"\n",
+                       bg_ref.index);
+       }
+
        /* Free i-node in the bitmap */
        uint32_t index_in_group = ext4_ialloc_inode2index_in_group(sb, index);
        ext4_bmap_bit_clr(bitmap_block.data, index_in_group);
@@ -238,6 +277,15 @@ int ext4_ialloc_alloc_inode(struct ext4_fs *fs, uint32_t *index, bool is_dir)
                                return rc;
                        }
 
+                       if (!ext4_ialloc_verify_bitmap_csum(sb,
+                                              bg_ref.block_group,
+                                              bitmap_block.data)) {
+                               ext4_dbg(DEBUG_IALLOC,
+                                       DBG_WARN "Bitmap checksum failed."
+                                       "Group: %" PRIu32"\n",
+                                       bg_ref.index);
+                       }
+
                        /* Try to allocate i-node in the bitmap */
                        uint32_t inodes_in_group =
                            ext4_inodes_in_group_cnt(sb, bgid);