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

main: open the fd correctly for reading xattrs

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

18
main.c
View File

@ -1157,18 +1157,31 @@ 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;
bool stat_only = false;
cleanup_free char *val = NULL; cleanup_free char *val = NULL;
cleanup_free char *origin = NULL; cleanup_free char *origin = NULL;
cleanup_close int fd = TEMP_FAILURE_RETRY (openat (it->fd, path, O_RDONLY|O_NONBLOCK|O_NOFOLLOW|O_PATH)); cleanup_close int fd = TEMP_FAILURE_RETRY (openat (it->fd, path, O_RDONLY|O_NONBLOCK|O_NOFOLLOW));
if (fd < 0) if (fd < 0)
continue; {
/* It is a symlink, read only the ino. */
if (errno == ELOOP && fstatat (it->fd, path, &st, AT_SYMLINK_NOFOLLOW) == 0)
{
ret->ino = st.st_ino;
ret->last_layer = it;
}
goto no_fd;
}
/* It is an open FD, stat the file and read the origin xattrs. */
if (fstat (fd, &st) == 0) if (fstat (fd, &st) == 0)
{ {
ret->ino = st.st_ino; ret->ino = st.st_ino;
ret->last_layer = it; ret->last_layer = it;
} }
if (stat_only)
goto no_fd;
s = safe_read_xattr (&val, fd, PRIVILEGED_ORIGIN_XATTR, PATH_MAX); s = safe_read_xattr (&val, fd, PRIVILEGED_ORIGIN_XATTR, PATH_MAX);
if (s > 0) if (s > 0)
{ {
@ -1211,6 +1224,7 @@ make_ovl_node (const char *path, struct ovl_layer *layer, const char *name, ino_
origin = NULL; origin = NULL;
} }
no_fd:
if (parent && parent->last_layer == it) if (parent && parent->last_layer == it)
break; break;
if (fast_ino_check) if (fast_ino_check)