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

main: always remap ids when specified

Browse Source 
if a mapping is specified, make sure it is always honored, also when
using xattr permissions.

Closes: https://github.com/containers/fuse-overlayfs/issues/253

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

7
direct.c
View File

@ -213,12 +213,6 @@ direct_num_of_layers (const char *opaque, const char *path)
return 1; return 1;
} }
static bool
direct_must_be_remapped (struct ovl_layer *l)
{
return l->has_privileged_stat_override == 0 && l->has_stat_override == 0;
}
struct data_source direct_access_ds = struct data_source direct_access_ds =
{ {
.num_of_layers = direct_num_of_layers, .num_of_layers = direct_num_of_layers,
@ -234,5 +228,4 @@ struct data_source direct_access_ds =
.getxattr = direct_getxattr, .getxattr = direct_getxattr,
.listxattr = direct_listxattr, .listxattr = direct_listxattr,
.readlinkat = direct_readlinkat, .readlinkat = direct_readlinkat,
.must_be_remapped = direct_must_be_remapped,
}; };

1
fuse-overlayfs.h
View File

@ -134,7 +134,6 @@ struct data_source
int (*listxattr)(struct ovl_layer *l, const char *path, char *buf, size_t size); int (*listxattr)(struct ovl_layer *l, const char *path, char *buf, size_t size);
int (*getxattr)(struct ovl_layer *l, const char *path, const char *name, char *buf, size_t size); int (*getxattr)(struct ovl_layer *l, const char *path, const char *name, char *buf, size_t size);
ssize_t (*readlinkat)(struct ovl_layer *l, const char *path, char *buf, size_t bufsiz); ssize_t (*readlinkat)(struct ovl_layer *l, const char *path, char *buf, size_t bufsiz);
bool (*must_be_remapped)(struct ovl_layer *l);
}; };
/* passthrough to the file system. */ /* passthrough to the file system. */

7
main.c
View File

@ -865,11 +865,8 @@ rpl_stat (fuse_req_t req, struct ovl_node *node, int fd, const char *path, struc
if (ret < 0) if (ret < 0)
return ret; return ret;
if (l->ds->must_be_remapped && l->ds->must_be_remapped (l)) st->st_uid = find_mapping (st->st_uid, data, true, true);
{ st->st_gid = find_mapping (st->st_gid, data, true, false);
st->st_uid = find_mapping (st->st_uid, data, true, true);
st->st_gid = find_mapping (st->st_gid, data, true, false);
}
st->st_ino = node->tmp_ino; st->st_ino = node->tmp_ino;
st->st_dev = node->tmp_dev; st->st_dev = node->tmp_dev;