[PATCH] ext4: unlock xattr_sem properly in ext4_inline_data_truncate()

[PATCH] ext4: unlock xattr_sem properly in ext4_inline_data_truncate()

[Joseph Qi]

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>
---
 fs/ext4/inline.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index caa5147..b41512d 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1880,6 +1880,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;
-- 
1.8.3.1

Re: [PATCH] ext4: unlock xattr_sem properly in ext4_inline_data_truncate()

[Andreas Dilger]

[-- Attachment #1: Type: text/plain, Size: 1049 bytes --]

On Nov 2, 2020, at 7:29 PM, Joseph Qi <joseph.qi@linux.alibaba.com> wrote:
> 
> 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>

> ---
> fs/ext4/inline.c | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
> index caa5147..b41512d 100644
> --- a/fs/ext4/inline.c
> +++ b/fs/ext4/inline.c
> @@ -1880,6 +1880,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;
> --
> 1.8.3.1
> 


Cheers, Andreas






[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 873 bytes --]

Re: [PATCH] ext4: unlock xattr_sem properly in ext4_inline_data_truncate()

[Theodore Y. Ts'o]

On Mon, Nov 02, 2020 at 08:15:36PM -0700, Andreas Dilger wrote:
> On Nov 2, 2020, at 7:29 PM, Joseph Qi <joseph.qi@linux.alibaba.com> wrote:
> > 
> > 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>

Thanks, applied.

					- Ted