lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 06 Mar 2012 16:03:10 -0800 From: "Darrick J. Wong" <djwong@...ibm.com> To: Andreas Dilger <adilger.kernel@...ger.ca>, Theodore Tso <tytso@....edu>, "Darrick J. Wong" <djwong@...ibm.com> Cc: Sunil Mushran <sunil.mushran@...cle.com>, Amir Goldstein <amir73il@...il.com>, Andi Kleen <andi@...stfloor.org>, Mingming Cao <cmm@...ibm.com>, Joel Becker <jlbec@...lplan.org>, linux-ext4@...r.kernel.org, Coly Li <colyli@...il.com> Subject: [PATCH 49/54] e2fsck: Check commit block checksum during recovery When recovering a journal with checksum v2, verify the commit block checksum. Signed-off-by: Darrick J. Wong <djwong@...ibm.com> --- e2fsck/recovery.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/e2fsck/recovery.c b/e2fsck/recovery.c index f76e7d8..8f55411 100644 --- a/e2fsck/recovery.c +++ b/e2fsck/recovery.c @@ -375,6 +375,26 @@ static int calc_chksums(journal_t *journal, struct buffer_head *bh, return 0; } +static int jbd2_commit_block_csum_verify(journal_t *j, void *buf) +{ + struct commit_header *h; + __u32 provided, calculated; + + if (!JFS_HAS_INCOMPAT_FEATURE(j, JFS_FEATURE_INCOMPAT_CSUM_V2)) + return 1; + + h = buf; + provided = h->h_chksum[0]; + h->h_chksum[0] = 0; + calculated = ext2fs_crc32c_le(~0, j->j_superblock->s_uuid, + sizeof(j->j_superblock->s_uuid)); + calculated = ext2fs_crc32c_le(calculated, buf, j->j_blocksize); + h->h_chksum[0] = provided; + + provided = ext2fs_be32_to_cpu(provided); + return provided == calculated; +} + static int do_one_pass(journal_t *journal, struct recovery_info *info, enum passtype pass) { @@ -696,6 +716,19 @@ static int do_one_pass(journal_t *journal, } crc32_sum = ~0; } + if (pass == PASS_SCAN && + !jbd2_commit_block_csum_verify(journal, + bh->b_data)) { + info->end_transaction = next_commit_ID; + + if (!JFS_HAS_INCOMPAT_FEATURE(journal, + JFS_FEATURE_INCOMPAT_ASYNC_COMMIT)) { + journal->j_failed_commit = + next_commit_ID; + brelse(bh); + break; + } + } brelse(bh); next_commit_ID++; continue; -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists