From: "Darrick J. Wong" Subject: [PATCH 48/51] e2fsck: Verify data block checksums when recovering journal Date: Tue, 13 Dec 2011 17:18:34 -0800 Message-ID: <20111214011834.20947.53707.stgit@elm3c44.beaverton.ibm.com> References: <20111214011316.20947.13706.stgit@elm3c44.beaverton.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: Sunil Mushran , Amir Goldstein , Andi Kleen , Mingming Cao , Joel Becker , linux-ext4@vger.kernel.org, Coly Li To: Andreas Dilger , Theodore Tso , "Darrick J. Wong" Return-path: Received: from e35.co.us.ibm.com ([32.97.110.153]:44495 "EHLO e35.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754757Ab1LNBTS (ORCPT ); Tue, 13 Dec 2011 20:19:18 -0500 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 13 Dec 2011 18:19:12 -0700 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pBE1Ia1g096514 for ; Tue, 13 Dec 2011 18:18:36 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pBE1IZcs029148 for ; Tue, 13 Dec 2011 18:18:36 -0700 In-Reply-To: <20111214011316.20947.13706.stgit@elm3c44.beaverton.ibm.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: Check the data block checksums when recovering the journal. Signed-off-by: Darrick J. Wong --- e2fsck/jfs_user.h | 11 ----------- e2fsck/recovery.c | 32 ++++++++++++++++++++++++++++++++ lib/ext2fs/kernel-jbd.h | 30 ++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 11 deletions(-) diff --git a/e2fsck/jfs_user.h b/e2fsck/jfs_user.h index 9e33306..4baba54 100644 --- a/e2fsck/jfs_user.h +++ b/e2fsck/jfs_user.h @@ -104,17 +104,6 @@ _INLINE_ void do_cache_destroy(lkmem_cache_t *cache) free(cache); } -/* - * helper functions to deal with 32 or 64bit block numbers. - */ -_INLINE_ size_t journal_tag_bytes(journal_t *journal) -{ - if (JFS_HAS_INCOMPAT_FEATURE(journal, JFS_FEATURE_INCOMPAT_64BIT)) - return JBD_TAG_SIZE64; - else - return JBD_TAG_SIZE32; -} - #undef _INLINE_ #endif diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c index 8f55411..d7c470e 100644 --- a/e2fsck/recovery.c +++ b/e2fsck/recovery.c @@ -395,6 +395,25 @@ static int jbd2_commit_block_csum_verify(journal_t *j, void *buf) return provided == calculated; } +static int jbd2_block_tag_csum_verify(journal_t *j, journal_block_tag_t *tag, + void *buf, __u32 sequence) +{ + __u32 provided, calculated; + + if (!JFS_HAS_INCOMPAT_FEATURE(j, JFS_FEATURE_INCOMPAT_CSUM_V2)) + return 1; + + sequence = ext2fs_cpu_to_be32(sequence); + calculated = ext2fs_crc32c_le(~0, j->j_superblock->s_uuid, + sizeof(j->j_superblock->s_uuid)); + calculated = ext2fs_crc32c_le(calculated, (__u8 *)&sequence, + sizeof(sequence)); + calculated = ext2fs_crc32c_le(calculated, buf, j->j_blocksize); + provided = ext2fs_be32_to_cpu(tag->t_checksum); + + return provided == ext2fs_cpu_to_be32(calculated); +} + static int do_one_pass(journal_t *journal, struct recovery_info *info, enum passtype pass) { @@ -575,6 +594,19 @@ static int do_one_pass(journal_t *journal, goto skip_write; } + /* Look for block corruption */ + if (!jbd2_block_tag_csum_verify( + journal, tag, obh->b_data, + be32_to_cpu(tmp->h_sequence))) { + brelse(obh); + success = -EIO; + printk(KERN_ERR "JBD: Invalid " + "checksum recovering " + "block %ld in log\n", + blocknr); + continue; + } + /* Find a buffer for the new * data being restored */ nbh = __getblk(journal->j_fs_dev, diff --git a/lib/ext2fs/kernel-jbd.h b/lib/ext2fs/kernel-jbd.h index 570bfa6..e9d725d 100644 --- a/lib/ext2fs/kernel-jbd.h +++ b/lib/ext2fs/kernel-jbd.h @@ -261,6 +261,36 @@ typedef struct journal_superblock_s JFS_FEATURE_INCOMPAT_ASYNC_COMMIT|\ JFS_FEATURE_INCOMPAT_64BIT) +#if (defined(E2FSCK_INCLUDE_INLINE_FUNCS) || !defined(NO_INLINE_FUNCS)) +#ifdef E2FSCK_INCLUDE_INLINE_FUNCS +#define _INLINE_ extern +#else +#ifdef __GNUC__ +#define _INLINE_ extern __inline__ +#else /* For Watcom C */ +#define _INLINE_ extern inline +#endif +#endif + +/* + * helper functions to deal with 32 or 64bit block numbers. + */ +_INLINE_ size_t journal_tag_bytes(journal_t *journal) +{ + journal_block_tag_t tag; + size_t x = 0; + + if (JFS_HAS_INCOMPAT_FEATURE(journal, JFS_FEATURE_INCOMPAT_CSUM_V2)) + x += sizeof(tag.t_checksum); + + if (JFS_HAS_INCOMPAT_FEATURE(journal, JFS_FEATURE_INCOMPAT_64BIT)) + return x + JBD_TAG_SIZE64; + else + return x + JBD_TAG_SIZE32; +} +#undef _INLINE_ +#endif + #ifdef __KERNEL__ #include