vfs/setxattr: ignore all unsupported xattr flags on the MacOS platform (

#5329)
juicedata · Nov 29, 2024 · d87d053 · d87d053
1 parent e9b08ff
commit d87d053
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/pkg/meta/utils_darwin.go b/pkg/meta/utils_darwin.go
@@ -17,5 +17,4 @@ const (
 	XattrCreateOrReplace = 0
 	XattrCreate          = sys.XATTR_CREATE
 	XattrReplace         = sys.XATTR_REPLACE
-	XattrNoSecurity      = sys.XATTR_NOSECURITY
 )
diff --git a/pkg/meta/utils_linux.go b/pkg/meta/utils_linux.go
@@ -17,5 +17,4 @@ const (
 	XattrCreateOrReplace = 0
 	XattrCreate          = sys.XATTR_CREATE
 	XattrReplace         = sys.XATTR_REPLACE
-	XattrNoSecurity      = 8
 )
diff --git a/pkg/meta/utils_windows.go b/pkg/meta/utils_windows.go
@@ -30,5 +30,4 @@ const (
 	XattrCreateOrReplace = 0
 	XattrCreate          = 1
 	XattrReplace         = 2
-	XattrNoSecurity      = 8
 )
diff --git a/pkg/vfs/vfs.go b/pkg/vfs/vfs.go
@@ -1021,6 +1021,8 @@ const (
 	xattrMaxSize = 65536
 )
 
+var macSupportFlags = meta.XattrCreateOrReplace | meta.XattrCreate | meta.XattrReplace
+
 func (v *VFS) SetXattr(ctx Context, ino Ino, name string, value []byte, flags uint32) (err syscall.Errno) {
 	defer func() { logit(ctx, "setxattr", err, "(%d,%s,%d,%d)", ino, name, len(value), flags) }()
 	if IsSpecialNode(ino) {
@@ -1063,9 +1065,9 @@ func (v *VFS) SetXattr(ctx Context, ino Ino, name string, value []byte, flags ui
 		err = v.Meta.SetFacl(ctx, ino, aclType, rule)
 		v.invalidateAttr(ino)
 	} else {
-		// ignore NoSecurity flag
-		if runtime.GOOS == "darwin" && (flags&meta.XattrNoSecurity) != 0 {
-			flags &= ^uint32(meta.XattrNoSecurity)
+		// only retain supported flags
+		if runtime.GOOS == "darwin" {
+			flags &= uint32(macSupportFlags)
 		}
 		err = v.Meta.SetXattr(ctx, ino, name, value, flags)
 	}