ext4: missing !bh check in ext4_xattr_inode_write()
authorVasily Averin <vvs@virtuozzo.com>
Fri, 9 Nov 2018 16:34:40 +0000 (11:34 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 9 Nov 2018 16:34:40 +0000 (11:34 -0500)
According to Ted Ts'o ext4_getblk() called in ext4_xattr_inode_write()
should not return bh = NULL

The only time that bh could be NULL, then, would be in the case of
something really going wrong; a programming error elsewhere (perhaps a
wild pointer dereference) or I/O error causing on-disk file system
corruption (although that would be highly unlikely given that we had
*just* allocated the blocks and so the metadata blocks in question
probably would still be in the cache).

Fixes: e50e5129f384 ("ext4: xattr-in-inode support")
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org # 4.13
fs/ext4/xattr.c

index 0b968868352626fd8aed6066eae9c43a0c1040e6..7643d52c776c61188ca6ac4a7ddd18d303c96e47 100644 (file)
@@ -1384,6 +1384,12 @@ retry:
                bh = ext4_getblk(handle, ea_inode, block, 0);
                if (IS_ERR(bh))
                        return PTR_ERR(bh);
                bh = ext4_getblk(handle, ea_inode, block, 0);
                if (IS_ERR(bh))
                        return PTR_ERR(bh);
+               if (!bh) {
+                       WARN_ON_ONCE(1);
+                       EXT4_ERROR_INODE(ea_inode,
+                                        "ext4_getblk() return bh = NULL");
+                       return -EFSCORRUPTED;
+               }
                ret = ext4_journal_get_write_access(handle, bh);
                if (ret)
                        goto out;
                ret = ext4_journal_get_write_access(handle, bh);
                if (ret)
                        goto out;