]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ext4: always initialize the crc32c checksum driver
authorTheodore Ts'o <tytso@mit.edu>
Fri, 30 Mar 2018 02:10:31 +0000 (22:10 -0400)
committerBrian Maly <brian.maly@oracle.com>
Mon, 14 Jan 2019 17:20:50 +0000 (12:20 -0500)
The extended attribute code now uses the crc32c checksum for hashing
purposes, so we should just always always initialize it.  We also want
to prevent NULL pointer dereferences if one of the metadata checksum
features is enabled after the file sytsem is originally mounted.

This issue has been assigned CVE-2018-1094.

https://bugzilla.kernel.org/show_bug.cgi?id=199183
https://bugzilla.redhat.com/show_bug.cgi?id=1560788

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
(cherry picked from commit a45403b51582a87872927a3e0fc0a389c26867f1)

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>
fs/ext4/super.c

index c4326f16573dc72f1c687642108ed0bced6eb664..00783dda0f79c1511cd0f8945f7bc8109d716566 100644 (file)
@@ -3546,14 +3546,12 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
        }
 
        /* Load the checksum driver */
-       if (ext4_has_feature_metadata_csum(sb)) {
-               sbi->s_chksum_driver = crypto_alloc_shash("crc32c", 0, 0);
-               if (IS_ERR(sbi->s_chksum_driver)) {
-                       ext4_msg(sb, KERN_ERR, "Cannot load crc32c driver.");
-                       ret = PTR_ERR(sbi->s_chksum_driver);
-                       sbi->s_chksum_driver = NULL;
-                       goto failed_mount;
-               }
+       sbi->s_chksum_driver = crypto_alloc_shash("crc32c", 0, 0);
+       if (IS_ERR(sbi->s_chksum_driver)) {
+               ext4_msg(sb, KERN_ERR, "Cannot load crc32c driver.");
+               ret = PTR_ERR(sbi->s_chksum_driver);
+               sbi->s_chksum_driver = NULL;
+               goto failed_mount;
        }
 
        /* Check superblock checksum */