From 398c35f4d78410725e154c2fc0a51ecac05a3f1f Mon Sep 17 00:00:00 2001

From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

Date: Wed, 22 Sep 2021 18:33:38 +0300

Subject: [Backport 398c35f4d784] src: Pass flags to ntfs_set_ea in

 ntfs_set_acl_ex

In case of removing of xattr there must be XATTR_REPLACE flag and

zero length. We already check XATTR_REPLACE in ntfs_set_ea, so

now we pass XATTR_REPLACE to ntfs_set_ea.

Reviewed-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/xattr.c | 9 +++++++--

 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/xattr.c b/src/xattr.c

index 3795943efc8e36d64710d8467ce48ef72c2121cd..70f2f9eb6b1eb3e7bebc3703762abfb7e42d7be1 100644

--- a/src/xattr.c

+++ b/src/xattr.c

@@ -549,6 +549,7 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,

 	size_t size, name_len;

 	void *value = NULL;

 	int err = 0;

+	int flags;

 	if (S_ISLNK(inode->i_mode))

 		return -EOPNOTSUPP;

@@ -591,20 +592,24 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,

 	}

 	if (!acl) {

+		/* Remove xattr if it can be presented via mode. */

 		size = 0;

 		value = NULL;

+		flags = XATTR_REPLACE;

 	} else {

 		size = posix_acl_xattr_size(acl->a_count);

 		value = kmalloc(size, GFP_NOFS);

 		if (!value)

 			return -ENOMEM;

-

 		err = posix_acl_to_xattr(mnt_userns, acl, value, size);

 		if (err < 0)

 			goto out;

+		flags = 0;

 	}

-	err = ntfs_set_ea(inode, name, name_len, value, size, 0, locked);

+	err = ntfs_set_ea(inode, name, name_len, value, size, flags, locked);

+	if (err == -ENODATA && !size)

+		err = 0; /* Removing non existed xattr. */

 	if (!err)

 		set_cached_acl(inode, type, acl);

-- 

2.31.1