Patchwork [30/37] e2fsck: Check extended attribute block checksums

login
register
mail settings
Submitter Darrick J. Wong
Date Sept. 1, 2011, 12:38 a.m.
Message ID <20110901003823.1176.78056.stgit@elm3c44.beaverton.ibm.com>
Download mbox | patch
Permalink /patch/112783/
State Changes Requested
Headers show

Comments

Darrick J. Wong - Sept. 1, 2011, 12:38 a.m.
Verify the checksums of separate extended attribute blocks and offer to clear
it if there is a mismatch.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
 e2fsck/pass1.c   |    7 +++++++
 e2fsck/problem.c |    5 +++++
 e2fsck/problem.h |    3 +++
 3 files changed, 15 insertions(+), 0 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 71cbddb..e4d4c78 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -1555,7 +1555,9 @@  static int check_ext_attr(e2fsck_t ctx, struct problem_context *pctx,
 	 * validate it
 	 */
 	pctx->blk = blk;
+	fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS;
 	pctx->errcode = ext2fs_read_ext_attr2(fs, blk, block_buf);
+	fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS;
 	if (pctx->errcode && fix_problem(ctx, PR_1_READ_EA_BLOCK, pctx))
 		goto clear_extattr;
 	header = (struct ext2_ext_attr_header *) block_buf;
@@ -1568,6 +1570,11 @@  static int check_ext_attr(e2fsck_t ctx, struct problem_context *pctx,
 			goto clear_extattr;
 	}
 
+	if (!ext2fs_ext_attr_block_csum_verify(fs, pctx->blk,
+			(struct ext2_ext_attr_header *)block_buf) &&
+	    fix_problem(ctx, PR_1_EA_BLOCK_CSUM_INVALID, pctx))
+		goto clear_extattr;
+
 	if (header->h_blocks != 1) {
 		if (fix_problem(ctx, PR_1_EA_MULTI_BLOCK, pctx))
 			goto clear_extattr;
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 835f0ff..1259568 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -920,6 +920,11 @@  static struct e2fsck_problem problem_table[] = {
 	  N_("@i %i checksum should not be set.  "),
 	  PROMPT_CLEAR, PR_PREEN_OK },
 
+	/* Checksum failure reading extended attribute block */
+	{ PR_1_EA_BLOCK_CSUM_INVALID,
+	  N_("Checksum failure @a @b %b for @i %i.  "),
+	  PROMPT_CLEAR, 0 },
+
 	/* Pass 1b errors */
 
 	/* Pass 1B: Rescan for duplicate/bad blocks */
diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index df29057..47e6904 100644
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -538,6 +538,9 @@  struct problem_context {
 /* inode checksum should not be set */
 #define PR_1_INODE_CSUM_NONZERO		0x010064
 
+/* ea block checksum invalid */
+#define PR_1_EA_BLOCK_CSUM_INVALID	0x010065
+
 /*
  * Pass 1b errors
  */