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 22/47] libext2fs: Add dx_root/dx_node checksum calculation and verification helpers
Date: Sat, 08 Oct 2011 00:35:35 -0700 [thread overview]
Message-ID: <20111008073535.17888.19955.stgit@elm3c44.beaverton.ibm.com> (raw)
In-Reply-To: <20111008073315.17888.22132.stgit@elm3c44.beaverton.ibm.com>
Verify and calculate checksums of htree internal node blocks.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
lib/ext2fs/csum.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++
lib/ext2fs/dirhash.c | 41 ++++++++++++++++++++
lib/ext2fs/ext2fs.h | 6 +++
3 files changed, 150 insertions(+), 0 deletions(-)
diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c
index 7f2d5af..cd788c8 100644
--- a/lib/ext2fs/csum.c
+++ b/lib/ext2fs/csum.c
@@ -30,6 +30,109 @@
#define STATIC static
#endif
+static errcode_t ext2fs_dx_csum(ext2_filsys fs, ext2_ino_t inum,
+ struct ext2_dir_entry *dirent,
+ __u32 *crc, int count_offset, int count)
+{
+ errcode_t retval = 0;
+ char *buf = (char *)dirent;
+ int size;
+ __u32 ncrc;
+
+ size = count_offset + (count * sizeof(struct ext2_dx_entry));
+
+ /*
+ * The dx_root/dx_entry structures are always accessed via
+ * le*_to_cpu helpers and don't need swapping here. However, the
+ * dirent container fields need to be swapped.
+ */
+#ifdef WORDS_BIGENDIAN
+ retval = ext2fs_get_mem(fs->blocksize, &buf);
+ if (retval)
+ return retval;
+ memcpy(buf, dirent, fs->blocksize);
+ retval = ext2fs_dirent_swab_out(fs, buf, 0);
+ if (retval)
+ goto out;
+#endif
+
+ inum = ext2fs_cpu_to_le32(inum);
+ ncrc = ext2fs_crc32c_le(~0, fs->super->s_uuid,
+ sizeof(fs->super->s_uuid));
+ ncrc = ext2fs_crc32c_le(ncrc, (unsigned char *)&inum, sizeof(inum));
+ ncrc = ext2fs_crc32c_le(ncrc, (unsigned char *)buf, size);
+ *crc = ncrc;
+
+#ifdef WORDS_BIGENDIAN
+out:
+ ext2fs_free_mem(&buf);
+#endif
+
+ return retval;
+}
+
+int ext2fs_dx_csum_verify(ext2_filsys fs, ext2_ino_t inum,
+ struct ext2_dir_entry *dirent)
+{
+ __u32 calculated;
+ errcode_t retval;
+ struct ext2_dx_countlimit *c;
+ struct ext2_dx_tail *t;
+ int count_offset, limit, count;
+
+ if (!EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+ return 1;
+
+ c = ext2fs_get_dx_countlimit(fs, dirent, &count_offset);
+ if (!c)
+ return 1;
+ limit = ext2fs_le16_to_cpu(c->limit);
+ count = ext2fs_le16_to_cpu(c->count);
+ if (count_offset + (limit * sizeof(struct ext2_dx_entry)) >
+ fs->blocksize - sizeof(struct ext2_dx_tail))
+ return 0;
+ /* htree structs are accessed in LE order */
+ t = (struct ext2_dx_tail *)(((struct ext2_dx_entry *)c) + limit);
+ retval = ext2fs_dx_csum(fs, inum, dirent, &calculated, count_offset,
+ count);
+ if (retval)
+ return 0;
+
+ return ext2fs_le32_to_cpu(t->checksum) == calculated;
+}
+
+errcode_t ext2fs_dx_csum_set(ext2_filsys fs, ext2_ino_t inum,
+ struct ext2_dir_entry *dirent)
+{
+ __u32 crc;
+ errcode_t retval = 0;
+ struct ext2_dx_countlimit *c;
+ struct ext2_dx_tail *t;
+ int count_offset, limit, count;
+
+ if (!EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+ return 0;
+
+ c = ext2fs_get_dx_countlimit(fs, dirent, &count_offset);
+ if (!c)
+ return 0;
+ limit = ext2fs_le16_to_cpu(c->limit);
+ count = ext2fs_le16_to_cpu(c->count);
+ if (count_offset + (limit * sizeof(struct ext2_dx_entry)) >
+ fs->blocksize - sizeof(struct ext2_dx_tail))
+ return 0;
+ t = (struct ext2_dx_tail *)(((struct ext2_dx_entry *)c) + limit);
+
+ /* htree structs are accessed in LE order */
+ retval = ext2fs_dx_csum(fs, inum, dirent, &crc, count_offset, count);
+ if (retval)
+ return retval;
+ t->checksum = ext2fs_cpu_to_le32(crc);
+ return retval;
+}
+
#define EXT3_EXTENT_TAIL_OFFSET(hdr) (sizeof(struct ext3_extent_header) + \
(sizeof(struct ext3_extent) * ext2fs_le16_to_cpu((hdr)->eh_max)))
diff --git a/lib/ext2fs/dirhash.c b/lib/ext2fs/dirhash.c
index c4ac94e..305e9ad 100644
--- a/lib/ext2fs/dirhash.c
+++ b/lib/ext2fs/dirhash.c
@@ -259,3 +259,44 @@ errcode_t ext2fs_dirhash(int version, const char *name, int len,
*ret_minor_hash = minor_hash;
return 0;
}
+
+struct ext2_dx_countlimit *ext2fs_get_dx_countlimit(ext2_filsys fs,
+ struct ext2_dir_entry *dirent, int *offset)
+{
+ struct ext2_dir_entry *dp;
+ struct ext2_dx_root_info *root;
+ struct ext2_dx_countlimit *c;
+ int count_offset, max_sane_entries;
+ unsigned int rec_len;
+ errcode_t retval;
+
+ retval = ext2fs_get_rec_len(fs, dirent, &rec_len);
+ if (retval)
+ return NULL;
+
+ if (rec_len == fs->blocksize && dirent->name_len == 0)
+ count_offset = 8;
+ else if (rec_len == 12) {
+ dp = (struct ext2_dir_entry *)(((void *)dirent) + rec_len);
+ retval = ext2fs_get_rec_len(fs, dp, &rec_len);
+ if (retval || rec_len != fs->blocksize - 12)
+ return NULL;
+ root = (struct ext2_dx_root_info *)(((void *)dp + 12));
+ if (root->reserved_zero ||
+ root->info_length != sizeof(struct ext2_dx_root_info))
+ return NULL;
+ count_offset = 32;
+ } else
+ return NULL;
+
+ c = (struct ext2_dx_countlimit *)(((void *)dirent) + count_offset);
+ max_sane_entries = (fs->blocksize - count_offset) /
+ sizeof(struct ext2_dx_entry);
+ if (ext2fs_le16_to_cpu(c->limit) > max_sane_entries ||
+ ext2fs_le16_to_cpu(c->count) > max_sane_entries)
+ return NULL;
+
+ if (offset)
+ *offset = count_offset;
+ return c;
+}
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index bf2a9e0..7836fd2 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -929,6 +929,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_dx_csum_set(ext2_filsys fs, ext2_ino_t inum,
+ struct ext2_dir_entry *dirent);
+extern int ext2fs_dx_csum_verify(ext2_filsys fs, ext2_ino_t inum,
+ struct ext2_dir_entry *dirent);
extern errcode_t ext2fs_extent_block_csum_set(ext2_filsys fs,
ext2_ino_t inum,
struct ext3_extent_header *eh);
@@ -1016,6 +1020,8 @@ extern errcode_t ext2fs_write_dir_block3(ext2_filsys fs, blk64_t block,
void *buf, int flags);
/* dirhash.c */
+extern struct ext2_dx_countlimit *ext2fs_get_dx_countlimit(ext2_filsys fs,
+ struct ext2_dir_entry *dirent, int *offset);
extern errcode_t ext2fs_dirhash(int version, const char *name, int len,
const __u32 *seed,
ext2_dirhash_t *ret_hash,
next prev parent reply other threads:[~2011-10-08 7:38 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-08 7:33 [PATCH v2 00/47] e2fsprogs: Add metadata checksumming Darrick J. Wong
2011-10-08 7:33 ` [PATCH 01/47] libext2fs: Read and write full size inodes Darrick J. Wong
2011-10-08 7:33 ` [PATCH 02/47] libext2fs: Add metadata checksum flag Darrick J. Wong
2011-10-08 7:33 ` [PATCH 03/47] debugfs: Optionally ignore bad checksums Darrick J. Wong
2011-10-08 7:33 ` [PATCH 04/47] libext2fs: Add inode checksum support Darrick J. Wong
2011-10-08 7:33 ` [PATCH 05/47] debugfs: Dump inode checksum when appropriate Darrick J. Wong
2011-10-08 7:33 ` [PATCH 06/47] tune2fs: Add inode checksum support Darrick J. Wong
2011-10-08 7:34 ` [PATCH 07/47] e2fsck: Verify and correct inode checksums Darrick J. Wong
2011-10-08 7:34 ` [PATCH 08/47] mke2fs: Allow metadata checksums to be turned on at mkfs time Darrick J. Wong
2011-10-08 7:34 ` [PATCH 09/47] libext2fs: Create the inode bitmap checksum Darrick J. Wong
2011-10-08 7:34 ` [PATCH 10/47] tune2fs: Rewrite inode bitmap checksums Darrick J. Wong
2011-10-08 7:34 ` [PATCH 11/47] dumpe2fs: Display inode bitmap checksum Darrick J. Wong
2011-10-08 7:34 ` [PATCH 12/47] e2fsck: Verify " Darrick J. Wong
2011-10-08 7:34 ` [PATCH 13/47] libext2fs: Create the block " Darrick J. Wong
2011-10-08 7:34 ` [PATCH 14/47] dumpe2fs: Display " Darrick J. Wong
2011-10-08 7:34 ` [PATCH 15/47] e2fsck: Verify " Darrick J. Wong
2011-10-08 7:34 ` [PATCH 16/47] e2fsck: Don't verify bitmap checksums Darrick J. Wong
2011-10-08 7:35 ` [PATCH 17/47] tune2fs: Rewrite block " Darrick J. Wong
2011-10-08 7:35 ` [PATCH 18/47] libext2fs: Verify and calculate extent tree block checksums Darrick J. Wong
2011-10-08 7:35 ` [PATCH 19/47] tune2fs: Enable extent tree checksums Darrick J. Wong
2011-10-08 7:35 ` [PATCH 20/47] libext2fs: Introduce dx_tail and dir_entry_tail Darrick J. Wong
2011-10-08 7:35 ` [PATCH 21/47] debugfs: Print htree internal node checksums Darrick J. Wong
2011-10-08 7:35 ` Darrick J. Wong [this message]
2011-10-08 7:35 ` [PATCH 23/47] e2fsck: Verify htree root/node checksums Darrick J. Wong
2011-10-08 7:35 ` [PATCH 24/47] libext2fs: Introduce dir_entry_tail to provide checksums for directory leaf nodes Darrick J. Wong
2011-10-08 7:35 ` [PATCH 25/47] e2fsck: Check directory leaf block checksums Darrick J. Wong
2011-10-08 7:36 ` [PATCH 26/47] tune2fs: Rebuild and checksum directories when toggling metadata_csum or changing UUID Darrick J. Wong
2011-10-08 7:36 ` [PATCH 27/47] libext2fs: Verify and calculate extended attribute block checksums Darrick J. Wong
2011-10-08 7:36 ` [PATCH 28/47] e2fsck: Check " Darrick J. Wong
2011-10-08 7:36 ` [PATCH 29/47] tune2fs: Rewrite " Darrick J. Wong
2011-10-08 7:36 ` [PATCH 30/47] libext2fs: Calculate and verify superblock checksums Darrick J. Wong
2011-10-08 7:36 ` [PATCH 31/47] e2fsck: Handle superblock checksum errors gracefully Darrick J. Wong
2011-10-08 7:36 ` [PATCH 32/47] libext2fs: Use i_generation in inode-related metadata checksums Darrick J. Wong
2011-10-08 7:36 ` [PATCH 33/47] libext2fs: Record the checksum algorithm in use in the superblock Darrick J. Wong
2011-10-08 7:36 ` [PATCH 34/47] tune2fs: Store checksum algorithm type in superblock Darrick J. Wong
2011-10-08 7:37 ` [PATCH 35/47] mke2fs: Record the checksum algorithm in use in the superblock Darrick J. Wong
2011-10-08 7:37 ` [PATCH 36/47] libext2fs: Block group checksum should use metadata_csum algorithm (if feature flag set) Darrick J. Wong
2011-10-08 7:37 ` [PATCH 37/47] tune2fs: Rewrite block group checksums when changing bg_use_meta_csum feature Darrick J. Wong
2011-10-08 7:37 ` [PATCH 38/47] mke2fs: Warn if not enabling all the features that metadata_csum wants Darrick J. Wong
2011-10-08 7:37 ` [PATCH 39/47] libext2fs: Add checksum to MMP block Darrick J. Wong
2011-10-08 7:37 ` [PATCH 40/47] e2fsck: Verify and correct MMP checksum problems Darrick J. Wong
2011-10-08 7:37 ` [PATCH 41/47] tune2fs: Force MMP update when changing metadata_csum flag Darrick J. Wong
2011-10-08 7:37 ` [PATCH 42/47] libext2fs: Add feature flags for jbd2 v2 checksums Darrick J. Wong
2011-10-08 7:37 ` [PATCH 43/47] e2fsck: Check journal superblock checksum prior to recovery Darrick J. Wong
2011-10-08 7:37 ` [PATCH 44/47] e2fsck: Check revoke block checksum during recovery Darrick J. Wong
2011-10-08 7:38 ` [PATCH 45/47] e2fsck: Check descriptor block checksum when recovering journal Darrick J. Wong
2011-10-08 7:38 ` [PATCH 46/47] e2fsck: Check commit block checksum during recovery Darrick J. Wong
2011-10-08 7:38 ` [PATCH 47/47] e2fsck: Verify data block checksums when recovering journal Darrick J. Wong
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=20111008073535.17888.19955.stgit@elm3c44.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).