From: "Darrick J. Wong" <djwong@us.ibm.com>
To: Andreas Dilger <adilger.kernel@dilger.ca>,
Theodore Tso <tytso@mit.edu>,
"Darrick J. Wong" <djwong@us.ibm.com>
Cc: Sunil Mushran <sunil.mushran@oracle.com>,
Amir Goldstein <amir73il@gmail.com>,
Andi Kleen <andi@firstfloor.org>, Mingming Cao <cmm@us.ibm.com>,
Joel Becker <jlbec@evilplan.org>,
linux-ext4@vger.kernel.org, Coly Li <colyli@gmail.com>
Subject: [PATCH 10/54] libext2fs: Create the inode bitmap checksum
Date: Tue, 06 Mar 2012 15:58:25 -0800 [thread overview]
Message-ID: <20120306235825.11945.30114.stgit@elm3b70.beaverton.ibm.com> (raw)
In-Reply-To: <20120306235720.11945.30629.stgit@elm3b70.beaverton.ibm.com>
Provide a field in the block group descriptor to store inode bitmap checksum,
and some helper functions to calculate and verify it.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
lib/ext2fs/blknum.c | 15 +++++++++++++++
lib/ext2fs/closefs.c | 29 +++++++++++++++++------------
lib/ext2fs/csum.c | 40 ++++++++++++++++++++++++++++++++++++++++
lib/ext2fs/ext2_err.et.in | 3 +++
lib/ext2fs/ext2_fs.h | 4 ++++
lib/ext2fs/ext2fs.h | 6 ++++++
lib/ext2fs/rw_bitmaps.c | 16 ++++++++++++++++
7 files changed, 101 insertions(+), 12 deletions(-)
diff --git a/lib/ext2fs/blknum.c b/lib/ext2fs/blknum.c
index 33da7d6..212ad48 100644
--- a/lib/ext2fs/blknum.c
+++ b/lib/ext2fs/blknum.c
@@ -230,6 +230,21 @@ void ext2fs_block_bitmap_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
}
/*
+ * Return the inode bitmap checksum of a group
+ */
+__u32 ext2fs_inode_bitmap_checksum(ext2_filsys fs, dgrp_t group)
+{
+ struct ext4_group_desc *gdp;
+ __u32 csum;
+
+ gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+ csum = gdp->bg_inode_bitmap_csum_lo;
+ if (fs->super->s_desc_size < EXT4_BG_INODE_BITMAP_CSUM_HI_END)
+ csum |= ((__u32)gdp->bg_inode_bitmap_csum_hi << 16);
+ return csum;
+}
+
+/*
* Return the inode bitmap block of a group
*/
blk64_t ext2fs_inode_bitmap_loc(ext2_filsys fs, dgrp_t group)
diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c
index 973c2a2..1867be3 100644
--- a/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@ -288,6 +288,23 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags)
fs->super->s_wtime = fs->now ? fs->now : time(NULL);
fs->super->s_block_group_nr = 0;
+
+ /*
+ * If the write_bitmaps() function is present, call it to
+ * flush the bitmaps. This is done this way so that a simple
+ * program that doesn't mess with the bitmaps doesn't need to
+ * drag in the bitmaps.c code.
+ *
+ * Bitmap checksums live in the group descriptor, so the
+ * bitmaps need to be written before the descriptors.
+ */
+ if (fs->write_bitmaps) {
+ retval = fs->write_bitmaps(fs);
+ if (retval)
+ goto errout;
+ }
+
+ /* Prepare the group descriptors for writing */
#ifdef WORDS_BIGENDIAN
retval = EXT2_ET_NO_MEMORY;
retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &super_shadow);
@@ -378,18 +395,6 @@ errcode_t ext2fs_flush2(ext2_filsys fs, int flags)
ext2fs_numeric_progress_close(fs, &progress, NULL);
- /*
- * If the write_bitmaps() function is present, call it to
- * flush the bitmaps. This is done this way so that a simple
- * program that doesn't mess with the bitmaps doesn't need to
- * drag in the bitmaps.c code.
- */
- if (fs->write_bitmaps) {
- retval = fs->write_bitmaps(fs);
- if (retval)
- goto errout;
- }
-
write_primary_superblock_only:
/*
* Write out master superblock. This has to be done
diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c
index 5091a00..90ccd18 100644
--- a/lib/ext2fs/csum.c
+++ b/lib/ext2fs/csum.c
@@ -30,6 +30,46 @@
#define STATIC static
#endif
+int ext2fs_inode_bitmap_csum_verify(ext2_filsys fs, dgrp_t group,
+ char *bitmap, int size)
+{
+ struct ext4_group_desc *gdp = (struct ext4_group_desc *)
+ ext2fs_group_desc(fs, fs->group_desc, group);
+ __u32 provided, calculated;
+
+ if (!EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+ return 1;
+ provided = gdp->bg_inode_bitmap_csum_lo;
+ calculated = ext2fs_crc32c_le(fs->csum_seed, (unsigned char *)bitmap,
+ size);
+ if (fs->super->s_desc_size >= EXT4_BG_INODE_BITMAP_CSUM_HI_END)
+ provided |= (__u32)gdp->bg_inode_bitmap_csum_hi << 16;
+ else
+ calculated &= 0xFFFF;
+
+ return provided == calculated;
+}
+
+errcode_t ext2fs_inode_bitmap_csum_set(ext2_filsys fs, dgrp_t group,
+ char *bitmap, int size)
+{
+ __u32 crc;
+ struct ext4_group_desc *gdp = (struct ext4_group_desc *)
+ ext2fs_group_desc(fs, fs->group_desc, group);
+
+ if (!EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+ return 0;
+
+ crc = ext2fs_crc32c_le(fs->csum_seed, (unsigned char *)bitmap, size);
+ gdp->bg_inode_bitmap_csum_lo = crc & 0xFFFF;
+ if (fs->super->s_desc_size >= EXT4_BG_INODE_BITMAP_CSUM_HI_END)
+ gdp->bg_inode_bitmap_csum_hi = crc >> 16;
+
+ return 0;
+}
+
static errcode_t ext2fs_inode_csum(ext2_filsys fs, ext2_ino_t inum,
struct ext2_inode_large *inode,
__u32 *crc, int has_hi)
diff --git a/lib/ext2fs/ext2_err.et.in b/lib/ext2fs/ext2_err.et.in
index d4a5b10..3f5d08f 100644
--- a/lib/ext2fs/ext2_err.et.in
+++ b/lib/ext2fs/ext2_err.et.in
@@ -446,4 +446,7 @@ ec EXT2_ET_MMP_OPEN_DIRECT,
ec EXT2_ET_INODE_CSUM_INVALID,
"Inode checksum does not match inode"
+ec EXT2_ET_INODE_BITMAP_CSUM_INVALID,
+ "Inode bitmap checksum does not match bitmap"
+
end
diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h
index 3ec48a2..7853966 100644
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -192,6 +192,10 @@ struct ext4_group_desc
__u32 bg_reserved;
};
+#define EXT4_BG_INODE_BITMAP_CSUM_HI_END \
+ (offsetof(struct ext4_group_desc, bg_inode_bitmap_csum_hi) + \
+ sizeof(__u16))
+
#define EXT2_BG_INODE_UNINIT 0x0001 /* Inode table/bitmap not initialized */
#define EXT2_BG_BLOCK_UNINIT 0x0002 /* Block bitmap not initialized */
#define EXT2_BG_INODE_ZEROED 0x0004 /* On-disk itable initialized to zero */
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 1728599..58538fe 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -809,6 +809,7 @@ extern errcode_t ext2fs_get_block_bitmap_range2(ext2fs_block_bitmap bmap,
void *out);
/* blknum.c */
+extern __u32 ext2fs_inode_bitmap_checksum(ext2_filsys fs, dgrp_t group);
extern dgrp_t ext2fs_group_of_blk2(ext2_filsys fs, blk64_t);
extern blk64_t ext2fs_group_first_block2(ext2_filsys fs, dgrp_t group);
extern blk64_t ext2fs_group_last_block2(ext2_filsys fs, dgrp_t group);
@@ -839,6 +840,7 @@ extern struct ext2_group_desc *ext2fs_group_desc(ext2_filsys fs,
extern blk64_t ext2fs_block_bitmap_loc(ext2_filsys fs, dgrp_t group);
extern void ext2fs_block_bitmap_loc_set(ext2_filsys fs, dgrp_t group,
blk64_t blk);
+extern __u32 ext2fs_inode_bitmap_csum(ext2_filsys fs, dgrp_t group);
extern blk64_t ext2fs_inode_bitmap_loc(ext2_filsys fs, dgrp_t group);
extern void ext2fs_inode_bitmap_loc_set(ext2_filsys fs, dgrp_t group,
blk64_t blk);
@@ -948,6 +950,10 @@ extern __u32 ext2fs_crc32c_be(__u32 crc, unsigned char const *p, size_t len);
extern __u32 ext2fs_crc32c_le(__u32 crc, unsigned char const *p, size_t len);
/* csum.c */
+extern errcode_t ext2fs_inode_bitmap_csum_set(ext2_filsys fs, dgrp_t group,
+ char *bitmap, int size);
+extern int ext2fs_inode_bitmap_csum_verify(ext2_filsys fs, dgrp_t group,
+ char *bitmap, int size);
extern errcode_t ext2fs_inode_csum_set(ext2_filsys fs, ext2_ino_t inum,
struct ext2_inode_large *inode);
extern int ext2fs_inode_csum_verify(ext2_filsys fs, ext2_ino_t inum,
diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
index 1d5f7b2..0ad5eb1 100644
--- a/lib/ext2fs/rw_bitmaps.c
+++ b/lib/ext2fs/rw_bitmaps.c
@@ -117,6 +117,12 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
if (retval)
goto errout;
+ retval = ext2fs_inode_bitmap_csum_set(fs, i, inode_buf,
+ inode_nbytes);
+ if (retval)
+ goto errout;
+ ext2fs_group_desc_csum_set(fs, i);
+
blk = ext2fs_inode_bitmap_loc(fs, i);
if (blk) {
retval = io_channel_write_blk64(fs->io, blk, 1,
@@ -288,6 +294,16 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
retval = EXT2_ET_INODE_BITMAP_READ;
goto cleanup;
}
+
+ /* verify inode bitmap checksum */
+ if (!(fs->flags &
+ EXT2_FLAG_IGNORE_CSUM_ERRORS) &&
+ !ext2fs_inode_bitmap_csum_verify(fs, i,
+ inode_bitmap, inode_nbytes)) {
+ retval =
+ EXT2_ET_INODE_BITMAP_CSUM_INVALID;
+ goto cleanup;
+ }
} else
memset(inode_bitmap, 0, inode_nbytes);
cnt = inode_nbytes << 3;
next prev parent reply other threads:[~2012-03-06 23:58 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-06 23:57 [PATCH v3 00/54] e2fsprogs: Add metadata checksumming Darrick J. Wong
2012-03-06 23:57 ` [PATCH 01/54] libext2fs: Read and write full size inodes Darrick J. Wong
2012-03-09 23:36 ` Ted Ts'o
2012-03-12 22:23 ` Darrick J. Wong
2012-03-12 22:53 ` Ted Ts'o
2012-03-06 23:57 ` [PATCH 02/54] libext2fs: Change ext4 on-disk layout to support metadata checksumming Darrick J. Wong
2012-03-09 22:04 ` Ted Ts'o
2012-03-12 22:24 ` Darrick J. Wong
2012-03-06 23:57 ` [PATCH 03/54] debugfs: Optionally ignore bad checksums Darrick J. Wong
2012-03-06 23:57 ` [PATCH 04/54] libext2fs: Precompute FS UUID checksum seed Darrick J. Wong
2012-03-06 23:57 ` [PATCH 05/54] libext2fs: Add inode checksum support Darrick J. Wong
2012-03-06 23:57 ` [PATCH 06/54] debugfs: Dump inode checksum when appropriate Darrick J. Wong
2012-03-06 23:58 ` [PATCH 07/54] tune2fs: Add inode checksum support Darrick J. Wong
2012-03-06 23:58 ` [PATCH 08/54] e2fsck: Verify and correct inode checksums Darrick J. Wong
2012-03-10 5:09 ` Ted Ts'o
2012-03-12 22:49 ` Darrick J. Wong
2012-03-06 23:58 ` [PATCH 09/54] mke2fs: Allow metadata checksums to be turned on at mkfs time Darrick J. Wong
2012-03-06 23:58 ` Darrick J. Wong [this message]
2012-03-06 23:58 ` [PATCH 11/54] tune2fs: Rewrite inode bitmap checksums Darrick J. Wong
2012-03-06 23:58 ` [PATCH 12/54] dumpe2fs: Display inode bitmap checksum Darrick J. Wong
2012-03-06 23:58 ` [PATCH 13/54] e2fsck: Verify " Darrick J. Wong
2012-03-10 5:46 ` Ted Ts'o
2012-03-11 2:11 ` Ted Ts'o
2012-03-12 21:25 ` Darrick J. Wong
2012-03-12 22:30 ` Darrick J. Wong
2012-03-13 0:32 ` [PATCH v3.1 " Darrick J. Wong
2012-03-06 23:58 ` [PATCH 14/54] libext2fs: Create the block " Darrick J. Wong
2012-03-06 23:58 ` [PATCH 15/54] dumpe2fs: Display " Darrick J. Wong
2012-03-06 23:59 ` [PATCH 16/54] e2fsck: Verify " Darrick J. Wong
2012-03-13 0:33 ` [PATCH v3.1 " Darrick J. Wong
2012-03-06 23:59 ` [PATCH 17/54] e2fsck: Don't verify bitmap checksums Darrick J. Wong
2012-03-06 23:59 ` [PATCH 18/54] tune2fs: Rewrite block " Darrick J. Wong
2012-03-06 23:59 ` [PATCH 19/54] libext2fs: Verify and calculate extent tree block checksums Darrick J. Wong
2012-03-06 23:59 ` [PATCH 20/54] tune2fs: Enable extent tree checksums Darrick J. Wong
2012-03-06 23:59 ` [PATCH 21/54] e2fsck: Verify extent tree blocks and clear the bad ones Darrick J. Wong
2012-03-06 23:59 ` [PATCH 22/54] debugfs: Print htree internal node checksums Darrick J. Wong
2012-03-06 23:59 ` [PATCH 23/54] libext2fs: Add dx_root/dx_node checksum calculation and verification helpers Darrick J. Wong
2012-03-06 23:59 ` [PATCH 24/54] e2fsck: Verify htree root/node checksums Darrick J. Wong
2012-03-13 0:35 ` [PATCH v3.1 " Darrick J. Wong
2012-03-07 0:00 ` [PATCH 25/54] libext2fs: Introduce dir_entry_tail to provide checksums for directory leaf nodes Darrick J. Wong
2012-03-07 0:00 ` [PATCH 26/54] e2fsck: Check directory leaf block checksums Darrick J. Wong
2012-03-07 0:00 ` [PATCH 27/54] tune2fs: Rebuild and checksum directories when toggling metadata_csum or changing UUID Darrick J. Wong
2012-03-07 0:00 ` [PATCH 28/54] libext2fs: Verify and calculate extended attribute block checksums Darrick J. Wong
2012-03-07 0:00 ` [PATCH 29/54] e2fsck: Check " Darrick J. Wong
2012-03-10 5:22 ` Ted Ts'o
2012-03-12 22:43 ` Darrick J. Wong
2012-03-07 0:00 ` [PATCH 30/54] tune2fs: Rewrite " Darrick J. Wong
2012-03-07 0:00 ` [PATCH 31/54] libext2fs: Calculate and verify superblock checksums Darrick J. Wong
2012-03-07 0:00 ` [PATCH 32/54] e2fsck: Handle superblock checksum errors gracefully Darrick J. Wong
2012-03-07 0:01 ` [PATCH 33/54] libext2fs: Record the checksum algorithm in use in the superblock Darrick J. Wong
2012-03-07 0:01 ` [PATCH 34/54] tune2fs: Store checksum algorithm type in superblock Darrick J. Wong
2012-03-07 0:01 ` [PATCH 35/54] mke2fs: Record the checksum algorithm in use in the superblock Darrick J. Wong
2012-03-07 0:01 ` [PATCH 36/54] libext2fs: Block group checksum should use metadata_csum algorithm Darrick J. Wong
2012-03-07 0:01 ` [PATCH 37/54] e2fsck: Ensure block group checksum uses " Darrick J. Wong
2012-03-13 0:38 ` [PATCH v3.1 " Darrick J. Wong
2012-03-07 0:01 ` [PATCH 38/54] tune2fs: Rewrite block group checksums when changing checksumming feature flags Darrick J. Wong
2012-03-07 0:02 ` [PATCH 39/54] mke2fs: Write new group descriptors with the appropriate checksum Darrick J. Wong
2012-03-07 0:02 ` [PATCH 40/54] mke2fs: Warn if not enabling all the features that metadata_csum wants Darrick J. Wong
2012-03-07 0:02 ` [PATCH 41/54] libext2fs: Add checksum to MMP block Darrick J. Wong
2012-03-07 0:02 ` [PATCH 42/54] e2fsck: Verify and correct MMP checksum problems Darrick J. Wong
2012-03-07 0:02 ` [PATCH 43/54] tune2fs: Force MMP update when changing metadata_csum flag Darrick J. Wong
2012-03-07 0:02 ` [PATCH 44/54] libext2fs: Change on-disk journal layout to support metadata checksumming Darrick J. Wong
2012-03-07 0:02 ` [PATCH 45/54] libext2fs: Dump feature flags for jbd2 v2 checksums Darrick J. Wong
2012-03-07 0:02 ` [PATCH 46/54] e2fsck: Check journal superblock checksum prior to recovery Darrick J. Wong
2012-03-07 0:02 ` [PATCH 47/54] e2fsck: Check revoke block checksum during recovery Darrick J. Wong
2012-03-07 0:03 ` [PATCH 48/54] e2fsck: Check descriptor block checksum when recovering journal Darrick J. Wong
2012-03-07 0:03 ` [PATCH 49/54] e2fsck: Check commit block checksum during recovery Darrick J. Wong
2012-03-07 0:03 ` [PATCH 50/54] e2fsck: Verify data block checksums when recovering journal Darrick J. Wong
2012-03-07 0:03 ` [PATCH 51/54] libext2fs: Enable support for the metadata checksumming feature Darrick J. Wong
2012-03-07 0:03 ` [PATCH 52/54] libext2fs: Bring the CRC32c implementation up to date with the kernel implementation Darrick J. Wong
2012-03-07 0:03 ` [PATCH 53/54] e2fsck: Refactor crc32_be code Darrick J. Wong
2012-03-07 0:03 ` [PATCH 54/54] mke2fs: Enable metadata_csum on ext4dev filesystems Darrick J. Wong
2012-03-09 22:37 ` [PATCH v3 00/54] e2fsprogs: Add metadata checksumming Ted Ts'o
2012-03-13 0:41 ` Darrick J. Wong
2012-03-13 4:04 ` Andreas Dilger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120306235825.11945.30114.stgit@elm3b70.beaverton.ibm.com \
--to=djwong@us.ibm.com \
--cc=adilger.kernel@dilger.ca \
--cc=amir73il@gmail.com \
--cc=andi@firstfloor.org \
--cc=cmm@us.ibm.com \
--cc=colyli@gmail.com \
--cc=jlbec@evilplan.org \
--cc=linux-ext4@vger.kernel.org \
--cc=sunil.mushran@oracle.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).