summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Qi <joseph.qi@linux.alibaba.com>2020-11-03 10:29:02 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-18 18:25:00 +0100
commit9fbacd44844c614784d8a96e2aed1c197202ceba (patch)
tree6dc1dbd51b47d8d36b56fe82ee5f3b2ba4a0f890
parent28f2350893a068fbde10e6e3621672b5a0e70058 (diff)
downloadlinux-stable-9fbacd44844c614784d8a96e2aed1c197202ceba.tar.gz
linux-stable-9fbacd44844c614784d8a96e2aed1c197202ceba.tar.bz2
linux-stable-9fbacd44844c614784d8a96e2aed1c197202ceba.zip
ext4: unlock xattr_sem properly in ext4_inline_data_truncate()
commit 7067b2619017d51e71686ca9756b454de0e5826a upstream. It takes xattr_sem to check inline data again but without unlock it in case not have. So unlock it before return. Fixes: aef1c8513c1f ("ext4: let ext4_truncate handle inline data correctly") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: Tao Ma <boyu.mt@taobao.com> Signed-off-by: Joseph Qi <joseph.qi@linux.alibaba.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> Link: https://lore.kernel.org/r/1604370542-124630-1-git-send-email-joseph.qi@linux.alibaba.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/ext4/inline.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 00f9433eea23..df585267d3c2 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1892,6 +1892,7 @@ void ext4_inline_data_truncate(struct inode *inode, int *has_inline)
ext4_write_lock_xattr(inode, &no_expand);
if (!ext4_has_inline_data(inode)) {
+ ext4_write_unlock_xattr(inode, &no_expand);
*has_inline = 0;
ext4_journal_stop(handle);
return;