Merge pull request #195 from giuseppe/no-read-fd

main: stop ino lookup without an open fd
This commit is contained in:
Daniel J Walsh 2020-03-16 10:22:24 -04:00 committed by GitHub
commit 4b97cf9ee6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

8
main.c
View File

@ -1259,7 +1259,8 @@ make_ovl_node (struct ovl_data *lo, const char *path, struct ovl_layer *layer, c
} }
ret->last_layer = it; ret->last_layer = it;
} }
goto no_fd; has_origin = false;
goto no_fd;
} }
/* It is an open FD, stat the file and read the origin xattrs. */ /* It is an open FD, stat the file and read the origin xattrs. */
@ -1276,7 +1277,10 @@ make_ovl_node (struct ovl_data *lo, const char *path, struct ovl_layer *layer, c
} }
if (stat_only) if (stat_only)
goto no_fd; {
has_origin = false;
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)