From: John Donnelly <john.p.donnelly@oracle.com>
Date: Mon, 7 Jan 2019 18:10:50 +0000 (-0800)
Subject: ext4: update inline int ext4_has_metadata_csum(struct super_block *sb)
X-Git-Tag: v4.1.12-124.31.3~332
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8d35c5d10338a9e7edca5450a8ffb2b069e41e32;p=users%2Fjedix%2Flinux-maple.git

ext4: update inline int ext4_has_metadata_csum(struct super_block *sb)

 to include ext4_has_feature_metadata_csum(sb) check.

Orabug: 29114440
CVE: CVE-2018-1094

Signed-off-by: John Donnelly <john.p.donnelly@oracle.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index d3ccdf3f2795f..dc9378e354680 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2648,7 +2648,8 @@ static inline int ext4_has_metadata_csum(struct super_block *sb)
 	WARN_ON_ONCE(ext4_has_feature_metadata_csum(sb) &&
 		     !EXT4_SB(sb)->s_chksum_driver);
 
-	return (EXT4_SB(sb)->s_chksum_driver != NULL);
+	return  ext4_has_feature_metadata_csum(sb) &&
+			(EXT4_SB(sb)->s_chksum_driver != NULL);
 }
 static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es)
 {