Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4903c091 authored by Vasily Averin's avatar Vasily Averin Committed by Greg Kroah-Hartman
Browse files

ext4: missing !bh check in ext4_xattr_inode_write() 



commit eb6984fa4ce2837dcb1f66720a600f31b0bb3739 upstream.

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: e50e5129 ("ext4: xattr-in-inode support")
Signed-off-by: default avatarVasily Averin <vvs@virtuozzo.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org # 4.13
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 20dd2c4e

fs/ext4/xattr.c

+6 −0
Original line number Diff line number Diff line
@@ -1388,6 +1388,12 @@ static int ext4_xattr_inode_write(handle_t *handle, struct inode *ea_inode, 
		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;