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 19:20:28 +0100
commit062c9b04f6ebc27ffb84684792ae3b029b8d0b9a (patch)
tree918c4d56ecdd29f701b5bc547130a25eefe12e90
parenta6ca4c7ec44c675cf368d8cb32542c0dc4d491cd (diff)
downloadlinux-stable-062c9b04f6ebc27ffb84684792ae3b029b8d0b9a.tar.gz
linux-stable-062c9b04f6ebc27ffb84684792ae3b029b8d0b9a.tar.bz2
linux-stable-062c9b04f6ebc27ffb84684792ae3b029b8d0b9a.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 2fec62d764fa..519378a15bc6 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1918,6 +1918,7 @@ int 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 0;