TheCloud/fuse-overlayfs
1
0
Fork 0
mirror of https://github.com/containers/fuse-overlayfs.git synced 2025-08-03 09:55:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #410 from giuseppe/propagate-force-mask-on-dir-copyup

Browse Source 
main: propagate xattrs permissions with copyup
This commit is contained in:
Giuseppe Scrivano 2023-11-03 10:36:21 +01:00 committed by GitHub
commit 18f4d6768a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.c
View File

@ -2866,7 +2866,7 @@ create_directory (struct ovl_data *lo, int dirfd, const char *name, const struct
bool need_rename; bool need_rename;
mode_t backing_file_mode = mode | (lo->xattr_permissions ? 0755 : 0); mode_t backing_file_mode = mode | (lo->xattr_permissions ? 0755 : 0);
need_rename = set_opaque || times || xattr_sfd >= 0 || uid != lo->uid || gid != lo->gid; need_rename = set_opaque || times || xattr_sfd >= 0 || uid != lo->uid || gid != lo->gid || get_upper_layer (lo)->stat_override_mode != STAT_OVERRIDE_NONE;
if (! need_rename) if (! need_rename)
{ {
/* mkdir can be used directly without a temporary directory in the working directory. */ /* mkdir can be used directly without a temporary directory in the working directory. */
@ -2937,6 +2937,7 @@ create_directory (struct ovl_data *lo, int dirfd, const char *name, const struct
ret = fstat (dfd, st_out); ret = fstat (dfd, st_out);
if (ret < 0) if (ret < 0)
goto out; goto out;
st_out->st_mode = (st_out->st_mode & S_IFMT) | (mode & ~S_IFMT);
} }
ret = inherit_acl (lo, parent, dfd, NULL); ret = inherit_acl (lo, parent, dfd, NULL);
@ -3009,6 +3010,9 @@ create_node_directory (struct ovl_data *lo, struct ovl_node *src)
times[0] = st.st_atim; times[0] = st.st_atim;
times[1] = st.st_mtim; times[1] = st.st_mtim;
if (override_mode (src->layer, sfd, NULL, NULL, &st) < 0 && errno != ENODATA && errno != EOPNOTSUPP)
return -1;
ret = create_directory (lo, get_upper_layer (lo)->fd, src->path, times, src->parent, sfd, st.st_uid, st.st_gid, st.st_mode, false, NULL); ret = create_directory (lo, get_upper_layer (lo)->fd, src->path, times, src->parent, sfd, st.st_uid, st.st_gid, st.st_mode, false, NULL);
if (ret == 0) if (ret == 0)
{ {