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

Merge pull request #24 from giuseppe/read-dangling-symlinks

Browse Source 
fuse-overlayfs: read correctly inode for dangling symlinks
This commit is contained in:
Giuseppe Scrivano 2018-11-07 11:12:08 +01:00 committed by GitHub
commit a4f88df17c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main.c
View File

@ -765,13 +765,18 @@ make_ovl_node (const char *path, struct ovl_layer *layer, const char *name, ino_
for (it = layer; it; it = it->next) for (it = layer; it; it = it->next)
{ {
ssize_t s; ssize_t s;
int fd = TEMP_FAILURE_RETRY (openat (it->fd, path, O_RDONLY|O_NONBLOCK)); int fd = TEMP_FAILURE_RETRY (openat (it->fd, path, O_RDONLY|O_NONBLOCK|O_NOFOLLOW|O_PATH));
if (fd < 0) if (fd < 0)
continue; continue;
if (fstat (fd, &st) == 0) if (fstat (fd, &st) == 0)
ret->ino = st.st_ino; ret->ino = st.st_ino;
close (fd);
fd = TEMP_FAILURE_RETRY (openat (it->fd, path, O_RDONLY|O_NONBLOCK|O_NOFOLLOW));
if (fd < 0)
continue;
s = fgetxattr (fd, PRIVILEGED_ORIGIN_XATTR, path, sizeof (path) - 1); s = fgetxattr (fd, PRIVILEGED_ORIGIN_XATTR, path, sizeof (path) - 1);
if (s > 0) if (s > 0)
{ {
@ -1099,6 +1104,7 @@ do_lookup_file (struct ovl_data *lo, fuse_ino_t parent, const char *name)
{ {
int ret; int ret;
char path[PATH_MAX]; char path[PATH_MAX];
char whpath[PATH_MAX];
struct ovl_layer *it; struct ovl_layer *it;
struct stat st; struct stat st;
struct ovl_layer *upper_layer = get_upper_layer (lo); struct ovl_layer *upper_layer = get_upper_layer (lo);
@ -1141,11 +1147,20 @@ do_lookup_file (struct ovl_data *lo, fuse_ino_t parent, const char *name)
} }
} }
sprintf (whpath, "%s/.wh.%s", pnode->path, name);
ret = TEMP_FAILURE_RETRY (fstatat (it->fd, whpath, &st, AT_SYMLINK_NOFOLLOW));
if (ret < 0 && errno != ENOENT)
return NULL;
if (ret == 0)
node = make_whiteout_node (path, name);
else
{
wh_name = get_whiteout_name (name, &st); wh_name = get_whiteout_name (name, &st);
if (wh_name) if (wh_name)
node = make_whiteout_node (path, wh_name); node = make_whiteout_node (path, wh_name);
else else
node = make_ovl_node (path, it, name, 0, st.st_mode & S_IFDIR, pnode); node = make_ovl_node (path, it, name, 0, st.st_mode & S_IFDIR, pnode);
}
if (node == NULL) if (node == NULL)
{ {
errno = ENOMEM; errno = ENOMEM;
@ -2507,6 +2522,7 @@ ovl_setattr (fuse_req_t req, fuse_ino_t ino, struct stat *attr, int to_set, stru
return; return;
} }
memset (times, 0, sizeof (times));
times[0].tv_sec = UTIME_OMIT; times[0].tv_sec = UTIME_OMIT;
times[1].tv_sec = UTIME_OMIT; times[1].tv_sec = UTIME_OMIT;
if (to_set & FUSE_SET_ATTR_ATIME) if (to_set & FUSE_SET_ATTR_ATIME)