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

main: move stat override mode to enum

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2020-11-06 13:17:14 +01:00
parent d450ee1560
commit 3dbb7d9bd5
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
4 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct.c
View File

@ -194,9 +194,9 @@ direct_load_data_source (struct ovl_layer *l, const char *opaque, const char *pa
} }
if (fgetxattr (l->fd, XATTR_PRIVILEGED_OVERRIDE_STAT, tmp, sizeof (tmp)) >= 0) if (fgetxattr (l->fd, XATTR_PRIVILEGED_OVERRIDE_STAT, tmp, sizeof (tmp)) >= 0)
l->has_privileged_stat_override = 1; l->stat_override_mode = STAT_OVERRIDE_PRIVILEGED;
else if (fgetxattr (l->fd, XATTR_OVERRIDE_STAT, tmp, sizeof (tmp)) >= 0) else if (fgetxattr (l->fd, XATTR_OVERRIDE_STAT, tmp, sizeof (tmp)) >= 0)
l->has_stat_override = 1; l->stat_override_mode = STAT_OVERRIDE_USER;
return 0; return 0;
} }

10
fuse-overlayfs.h
View File

@ -104,6 +104,13 @@ struct ovl_data
struct ovl_plugin_context *plugins_ctx; struct ovl_plugin_context *plugins_ctx;
}; };
enum stat_override_mode
{
STAT_OVERRIDE_NONE,
STAT_OVERRIDE_USER,
STAT_OVERRIDE_PRIVILEGED,
};
struct ovl_layer struct ovl_layer
{ {
struct ovl_layer *next; struct ovl_layer *next;
@ -114,8 +121,7 @@ struct ovl_layer
bool low; bool low;
void *data_source_private_data; void *data_source_private_data;
unsigned int has_stat_override : 1; int stat_override_mode;
unsigned int has_privileged_stat_override : 1;
}; };
/* a data_source defines the methods for accessing a lower layer. */ /* a data_source defines the methods for accessing a lower layer. */

14
main.c
View File

@ -2708,7 +2708,7 @@ create_directory (struct ovl_data *lo, int dirfd, const char *name, const struct
if (ret < 0) if (ret < 0)
goto out; goto out;
if (uid != lo->uid || gid != lo->gid || get_upper_layer (lo)->has_stat_override || get_upper_layer (lo)->has_privileged_stat_override) if (uid != lo->uid || gid != lo->gid || get_upper_layer (lo)->stat_override_mode != STAT_OVERRIDE_NONE)
{ {
ret = do_fchown (lo, dfd, uid, gid, mode); ret = do_fchown (lo, dfd, uid, gid, mode);
if (ret < 0) if (ret < 0)
@ -2937,7 +2937,7 @@ copyup (struct ovl_data *lo, struct ovl_node *node)
if (dfd < 0) if (dfd < 0)
goto exit; goto exit;
if (st.st_uid != lo->uid || st.st_gid != lo->gid || get_upper_layer (lo)->has_stat_override || get_upper_layer (lo)->has_privileged_stat_override) if (st.st_uid != lo->uid || st.st_gid != lo->gid || get_upper_layer (lo)->stat_override_mode != STAT_OVERRIDE_NONE)
{ {
ret = do_fchown (lo, dfd, st.st_uid, st.st_gid, mode); ret = do_fchown (lo, dfd, st.st_uid, st.st_gid, mode);
if (ret < 0) if (ret < 0)
@ -3393,7 +3393,7 @@ direct_create_file (struct ovl_layer *l, int dirfd, const char *path, uid_t uid,
int ret; int ret;
/* try to create directly the file if it doesn't need to be chowned. */ /* try to create directly the file if it doesn't need to be chowned. */
if (uid == lo->uid && gid == lo->gid && !l->has_stat_override && !l->has_privileged_stat_override) if (uid == lo->uid && gid == lo->gid && l->stat_override_mode == STAT_OVERRIDE_NONE)
{ {
ret = TEMP_FAILURE_RETRY (safe_openat (get_upper_layer (lo)->fd, path, flags, mode)); ret = TEMP_FAILURE_RETRY (safe_openat (get_upper_layer (lo)->fd, path, flags, mode));
if (ret >= 0) if (ret >= 0)
@ -3407,7 +3407,7 @@ direct_create_file (struct ovl_layer *l, int dirfd, const char *path, uid_t uid,
fd = TEMP_FAILURE_RETRY (safe_openat (lo->workdir_fd, wd_tmp_file_name, flags, mode)); fd = TEMP_FAILURE_RETRY (safe_openat (lo->workdir_fd, wd_tmp_file_name, flags, mode));
if (fd < 0) if (fd < 0)
return -1; return -1;
if (uid != lo->uid || gid != lo->gid || l->has_stat_override || l->has_privileged_stat_override) if (uid != lo->uid || gid != lo->gid || l->stat_override_mode != STAT_OVERRIDE_NONE)
{ {
if (do_fchown (lo, fd, uid, gid, mode) < 0) if (do_fchown (lo, fd, uid, gid, mode) < 0)
{ {
@ -4106,7 +4106,7 @@ direct_symlinkat (struct ovl_layer *l, const char *target, const char *linkpath,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (uid != lo->uid || gid != lo->gid || l->has_stat_override || l->has_privileged_stat_override) if (uid != lo->uid || gid != lo->gid || l->stat_override_mode != STAT_OVERRIDE_NONE)
{ {
ret = do_fchownat (lo, lo->workdir_fd, wd_tmp_file_name, uid, gid, 0755, AT_SYMLINK_NOFOLLOW); ret = do_fchownat (lo, lo->workdir_fd, wd_tmp_file_name, uid, gid, 0755, AT_SYMLINK_NOFOLLOW);
if (ret < 0) if (ret < 0)
@ -5522,12 +5522,12 @@ main (int argc, char *argv[])
ssize_t s; ssize_t s;
if (lo.xattr_permissions == 1) if (lo.xattr_permissions == 1)
{ {
get_upper_layer (&lo)->has_privileged_stat_override = 1; get_upper_layer (&lo)->stat_override_mode = STAT_OVERRIDE_PRIVILEGED;
name = XATTR_PRIVILEGED_OVERRIDE_STAT; name = XATTR_PRIVILEGED_OVERRIDE_STAT;
} }
else if (lo.xattr_permissions == 2) else if (lo.xattr_permissions == 2)
{ {
get_upper_layer (&lo)->has_stat_override = 1; get_upper_layer (&lo)->stat_override_mode = STAT_OVERRIDE_USER;
name = XATTR_OVERRIDE_STAT; name = XATTR_OVERRIDE_STAT;
} }
else else

19
utils.c
View File

@ -240,10 +240,23 @@ override_mode (struct ovl_layer *l, int fd, const char *abs_path, const char *pa
cleanup_close int cleanup_fd = -1; cleanup_close int cleanup_fd = -1;
const char *xattr_name; const char *xattr_name;
if (l->has_stat_override == 0 && l->has_privileged_stat_override == 0) switch (l->stat_override_mode)
return 0; {
case STAT_OVERRIDE_NONE:
return 0;
xattr_name = l->has_privileged_stat_override ? XATTR_PRIVILEGED_OVERRIDE_STAT : XATTR_OVERRIDE_STAT; case STAT_OVERRIDE_USER:
xattr_name = XATTR_OVERRIDE_STAT;
break;
case STAT_OVERRIDE_PRIVILEGED:
xattr_name = XATTR_PRIVILEGED_OVERRIDE_STAT;
break;
default:
errno = EINVAL;
return -1;
}
if (fd >= 0) if (fd >= 0)
{ {