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

main: make sure the work directory is empty

Browse Source 
make sure the work directory is empty when fuse-overlayfs starts.

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

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2019-07-28 22:00:32 +02:00
parent f0d76efda5
commit cecbcbb7ad
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 61 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
main.c
View File

@ -2567,27 +2567,22 @@ update_paths (struct ovl_node *node)
} }
static int static int
empty_dir (struct ovl_data *lo, struct ovl_node *node) empty_dirfd (int fd)
{ {
cleanup_dir DIR *dp = NULL; cleanup_dir DIR *dp = NULL;
cleanup_close int cleanup_fd = -1;
struct dirent *dent; struct dirent *dent;
cleanup_fd = TEMP_FAILURE_RETRY (openat (get_upper_layer (lo)->fd, node->path, O_DIRECTORY)); dp = fdopendir (fd);
if (cleanup_fd < 0)
return -1;
if (set_fd_opaque (cleanup_fd) < 0)
return -1;
dp = fdopendir (cleanup_fd);
if (dp == NULL) if (dp == NULL)
return -1; {
close (fd);
cleanup_fd = -1; /* It is not owned by dp. */ return -1;
}
for (;;) for (;;)
{ {
int ret;
errno = 0; errno = 0;
dent = readdir (dp); dent = readdir (dp);
if (dent == NULL) if (dent == NULL)
@ -2601,13 +2596,59 @@ empty_dir (struct ovl_data *lo, struct ovl_node *node)
continue; continue;
if (strcmp (dent->d_name, "..") == 0) if (strcmp (dent->d_name, "..") == 0)
continue; continue;
if (unlinkat (dirfd (dp), dent->d_name, 0) < 0)
unlinkat (dirfd (dp), dent->d_name, AT_REMOVEDIR); ret = unlinkat (dirfd (dp), dent->d_name, 0);
if (ret < 0 && errno == EISDIR)
{
ret = unlinkat (dirfd (dp), dent->d_name, AT_REMOVEDIR);
if (ret < 0 && errno == ENOTEMPTY)
{
int dfd;
dfd = openat (dirfd (dp), dent->d_name, O_DIRECTORY);
if (dfd < 0)
return -1;
ret = empty_dirfd (dfd);
if (ret < 0)
return -1;
ret = unlinkat (dirfd (dp), dent->d_name, AT_REMOVEDIR);
if (ret < 0)
return -1;
continue;
}
}
if (ret < 0)
return ret;
} }
return 0; return 0;
} }
static int
empty_dir (struct ovl_data *lo, struct ovl_node *node)
{
cleanup_dir DIR *dp = NULL;
cleanup_close int cleanup_fd = -1;
struct dirent *dent;
int ret;
cleanup_fd = TEMP_FAILURE_RETRY (openat (get_upper_layer (lo)->fd, node->path, O_DIRECTORY));
if (cleanup_fd < 0)
return -1;
if (set_fd_opaque (cleanup_fd) < 0)
return -1;
ret = empty_dirfd (cleanup_fd);
cleanup_fd = -1;
return ret;
}
static void static void
do_rm (fuse_req_t req, fuse_ino_t parent, const char *name, bool dirp) do_rm (fuse_req_t req, fuse_ino_t parent, const char *name, bool dirp)
{ {
@ -3120,6 +3161,7 @@ ovl_create (fuse_req_t req, fuse_ino_t parent, const char *name,
fuse_reply_err (req, errno); fuse_reply_err (req, errno);
return; return;
} }
fi->fh = fd; fi->fh = fd;
fd = -1; /* Do not clean it up. */ fd = -1; /* Do not clean it up. */
@ -4763,6 +4805,7 @@ main (int argc, char *argv[])
error (EXIT_FAILURE, 0, "workdir not specified"); error (EXIT_FAILURE, 0, "workdir not specified");
else else
{ {
int dfd;
cleanup_free char *path = NULL; cleanup_free char *path = NULL;
path = realpath (lo.workdir, NULL); path = realpath (lo.workdir, NULL);
@ -4777,6 +4820,9 @@ main (int argc, char *argv[])
lo.workdir_fd = open (lo.workdir, O_DIRECTORY); lo.workdir_fd = open (lo.workdir, O_DIRECTORY);
if (lo.workdir_fd < 0) if (lo.workdir_fd < 0)
error (EXIT_FAILURE, errno, "cannot open workdir"); error (EXIT_FAILURE, errno, "cannot open workdir");
dfd = dup (lo.workdir_fd);
empty_dirfd (dfd);
} }
umask (0); umask (0);