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

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

ext4: fix buffer leak in ext4_expand_extra_isize_ea() on error path 



commit 53692ec074d00589c2cf1d6d17ca76ad0adce6ec upstream.

Fixes: de05ca85 ("ext4: move call to ext4_error() into ...")
Signed-off-by: default avatarVasily Averin <vvs@virtuozzo.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org # 4.17
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29ee4d62

fs/ext4/xattr.c

+5 −2
Original line number Diff line number Diff line
@@ -2708,7 +2708,6 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, 
			       struct ext4_inode *raw_inode, handle_t *handle)

{

	struct ext4_xattr_ibody_header *header;

	struct buffer_head *bh;

	struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);

	static unsigned int mnt_count;

	size_t min_offs;
@@ -2749,13 +2748,17 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, 
	 * EA block can hold new_extra_isize bytes.

	 */

	if (EXT4_I(inode)->i_file_acl) {

		struct buffer_head *bh;



		bh = sb_bread(inode->i_sb, EXT4_I(inode)->i_file_acl);

		error = -EIO;

		if (!bh)

			goto cleanup;

		error = ext4_xattr_check_block(inode, bh);

		if (error)

		if (error) {

			brelse(bh);

			goto cleanup;

		}

		base = BHDR(bh);

		end = bh->b_data + bh->b_size;

		min_offs = end - base;