diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2019-12-13 21:50:11 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-31 16:36:28 +0100 |
| commit | 307afc5d3f03efd7e284b85d3432e21b79384fc9 (patch) | |
| tree | aecbd7b3d9944a2272281c2ddd3df2afb65868dc | |
| parent | 14ccb2b84f5bfe3a9dad63e911bd9d3ab78fe26f (diff) | |
| download | linux-stable-307afc5d3f03efd7e284b85d3432e21b79384fc9.tar.gz linux-stable-307afc5d3f03efd7e284b85d3432e21b79384fc9.tar.bz2 linux-stable-307afc5d3f03efd7e284b85d3432e21b79384fc9.zip | |
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: c03b45b853f5 ("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>
| -rw-r--r-- | fs/ext4/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index ab16b7c6068c..215802cbc42b 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -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; } |