Commit 307afc5d authored Dec 13, 2019 by Dan Carpenter Committed by Greg Kroah-Hartman Dec 31, 2019

ext4: unlock on error in ext4_expand_extra_isize()



commit 7f420d64a08c1dcd65b27be82a27cf2bdb2e7847 upstream.

We need to unlock the xattr before returning on this error path.

Cc: stable@kernel.org # 4.13
Fixes: c03b45b8 ("ext4, project: expand inode extra size if possible")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20191213185010.6k7yl2tck3wlsdkt@kili.mountain


Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 14ccb2b8

fs/ext4/inode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -6027,7 +6027,7 @@ int ext4_expand_extra_isize(struct inode *inode,
		error = ext4_journal_get_write_access(handle, iloc->bh);
		if (error) {
		brelse(iloc->bh);
		goto out_stop;
		goto out_unlock;
		}

		error = __ext4_expand_extra_isize(inode, new_extra_isize, iloc,
		@@ -6037,8 +6037,8 @@ int ext4_expand_extra_isize(struct inode *inode,
		if (!error)
		error = rc;

		out_unlock:
		ext4_write_unlock_xattr(inode, &no_expand);
		out_stop:
		ext4_journal_stop(handle);
		return error;
		}