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

Commit d9d26222 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

ext4: fix some error pointer dereferences 



commit 7159a986b4202343f6cca3bb8079ecace5816fd6 upstream.

We can't pass error pointers to brelse().

Fixes: fb265c9cb49e ("ext4: add ext4_sb_bread() to disambiguate ENOMEM cases")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0feaa3ae

fs/ext4/xattr.c

+3 −0
Original line number Diff line number Diff line
@@ -828,6 +828,7 @@ int ext4_get_inode_usage(struct inode *inode, qsize_t *usage) 
		bh = ext4_sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl, REQ_PRIO);

		if (IS_ERR(bh)) {

			ret = PTR_ERR(bh);

			bh = NULL;

			goto out;

		}
@@ -2905,6 +2906,7 @@ int ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, 
			if (error == -EIO)

				EXT4_ERROR_INODE(inode, "block %llu read error",

						 EXT4_I(inode)->i_file_acl);

			bh = NULL;

			goto cleanup;

		}

		error = ext4_xattr_check_block(inode, bh);
@@ -3061,6 +3063,7 @@ ext4_xattr_block_cache_find(struct inode *inode, 
		if (IS_ERR(bh)) {

			if (PTR_ERR(bh) == -ENOMEM)

				return NULL;

			bh = NULL;

			EXT4_ERROR_INODE(inode, "block %lu read error",

					 (unsigned long)ce->e_value);

		} else if (ext4_xattr_cmp(header, BHDR(bh)) == 0) {