summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2014-09-11 11:44:36 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-09-11 11:44:36 -0400
commitdf4763bea5b04d8eed941cfe3df51f22cfe95570 (patch)
treebc084484cb2c1b14db9c1558a23a6ebc16b05ee7 /fs
parentfeb8c6d3dd0f2cc0e1c3376d099cf298c5f2c2c8 (diff)
downloadop-kernel-dev-df4763bea5b04d8eed941cfe3df51f22cfe95570.zip
op-kernel-dev-df4763bea5b04d8eed941cfe3df51f22cfe95570.tar.gz
ext4: validate external journal superblock checksum
If the external journal device has metadata_csum enabled, verify that the superblock checksum matches the block before we try to mount. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/super.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index fb219b9..2632017 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4414,6 +4414,15 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb,
goto out_bdev;
}
+ if ((le32_to_cpu(es->s_feature_ro_compat) &
+ EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) &&
+ es->s_checksum != ext4_superblock_csum(sb, es)) {
+ ext4_msg(sb, KERN_ERR, "external journal has "
+ "corrupt superblock");
+ brelse(bh);
+ goto out_bdev;
+ }
+
if (memcmp(EXT4_SB(sb)->s_es->s_journal_uuid, es->s_uuid, 16)) {
ext4_msg(sb, KERN_ERR, "journal UUID does not match");
brelse(bh);
OpenPOWER on IntegriCloud