From: Vasily Averin <vvs@virtuozzo.com>
Date: Wed, 7 Nov 2018 16:07:01 +0000 (-0500)
Subject: ext4: release bs.bh before re-using in ext4_xattr_block_find()
X-Git-Tag: v4.14.82~38
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8113972d21440db9d098d363ff00cca96d9ce1ab;p=users%2Fjedix%2Flinux-maple.git

ext4: release bs.bh before re-using in ext4_xattr_block_find()

commit 45ae932d246f721e6584430017176cbcadfde610 upstream.

bs.bh was taken in previous ext4_xattr_block_find() call,
it should be released before re-using

Fixes: 7e01c8e5420b ("ext3/4: fix uninitialized bs in ...")
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org # 2.6.26
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 3e6f326c34803..49b3d9b038e02 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -2404,6 +2404,8 @@ retry_inode:
 			error = ext4_xattr_block_set(handle, inode, &i, &bs);
 		} else if (error == -ENOSPC) {
 			if (EXT4_I(inode)->i_file_acl && !bs.s.base) {
+				brelse(bs.bh);
+				bs.bh = NULL;
 				error = ext4_xattr_block_find(inode, &i, &bs);
 				if (error)
 					goto cleanup;