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

main: skip deleting dev whiteouts when unprivileged

Browse Source 
do not attempt to delete device whiteouts when the process has not
enough privileges to create them.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2019-07-13 23:33:57 +02:00
parent c2aab54c83
commit 8d2aedcb19
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
main.c
View File

@ -230,6 +230,9 @@ static const struct fuse_opt ovl_opts[] = {
FUSE_OPT_END FUSE_OPT_END
}; };
/* The current process has enough privileges to use mknod. */
static bool can_mknod = true;
/* Kernel definitions. */ /* Kernel definitions. */
typedef unsigned char u8; typedef unsigned char u8;
@ -533,7 +536,6 @@ static int
create_whiteout (struct ovl_data *lo, struct ovl_node *parent, const char *name, bool skip_mknod, bool force_create) create_whiteout (struct ovl_data *lo, struct ovl_node *parent, const char *name, bool skip_mknod, bool force_create)
{ {
char whiteout_wh_path[PATH_MAX]; char whiteout_wh_path[PATH_MAX];
static bool can_mknod = true;
cleanup_close int fd = -1; cleanup_close int fd = -1;
int ret; int ret;
@ -590,30 +592,33 @@ delete_whiteout (struct ovl_data *lo, int dirfd, struct ovl_node *parent, const
{ {
struct stat st; struct stat st;
if (dirfd >= 0) if (can_mknod)
{ {
if (TEMP_FAILURE_RETRY (fstatat (dirfd, name, &st, AT_SYMLINK_NOFOLLOW)) == 0 if (dirfd >= 0)
&& (st.st_mode & S_IFMT) == S_IFCHR
&& major (st.st_rdev) == 0
&& minor (st.st_rdev) == 0)
{ {
if (unlinkat (dirfd, name, 0) < 0) if (TEMP_FAILURE_RETRY (fstatat (dirfd, name, &st, AT_SYMLINK_NOFOLLOW)) == 0
return -1; && (st.st_mode & S_IFMT) == S_IFCHR
&& major (st.st_rdev) == 0
&& minor (st.st_rdev) == 0)
{
if (unlinkat (dirfd, name, 0) < 0)
return -1;
}
} }
} else
else
{
char whiteout_path[PATH_MAX];
strconcat3 (whiteout_path, PATH_MAX, parent->path, "/", name);
if (TEMP_FAILURE_RETRY (fstatat (get_upper_layer (lo)->fd, whiteout_path, &st, AT_SYMLINK_NOFOLLOW)) == 0
&& (st.st_mode & S_IFMT) == S_IFCHR
&& major (st.st_rdev) == 0
&& minor (st.st_rdev) == 0)
{ {
if (unlinkat (get_upper_layer (lo)->fd, whiteout_path, 0) < 0) char whiteout_path[PATH_MAX];
return -1;
strconcat3 (whiteout_path, PATH_MAX, parent->path, "/", name);
if (TEMP_FAILURE_RETRY (fstatat (get_upper_layer (lo)->fd, whiteout_path, &st, AT_SYMLINK_NOFOLLOW)) == 0
&& (st.st_mode & S_IFMT) == S_IFCHR
&& major (st.st_rdev) == 0
&& minor (st.st_rdev) == 0)
{
if (unlinkat (get_upper_layer (lo)->fd, whiteout_path, 0) < 0)
return -1;
}
} }
} }