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

Merge pull request #111 from giuseppe/fix-create-unix-socket

Browse Source 
correctly read inode for unix sockets
This commit is contained in:
Daniel J Walsh 2019-08-26 10:46:57 -04:00 committed by GitHub
commit c548530b99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -1,3 +1,7 @@
* fuse-overlayfs-0.6.1
- fix a regression introduced with 0.6 where UNIX sockets could not be correctly created.
* fuse-overlayfs-0.6 * fuse-overlayfs-0.6
- fix an issue where changes to an inode would not be visible from another hard link. - fix an issue where changes to an inode would not be visible from another hard link.

2
configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([fuse-overlayfs], [0.6], [giuseppe@scrivano.org]) AC_INIT([fuse-overlayfs], [0.6.1], [giuseppe@scrivano.org])
AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

3
main.c
View File

@ -1348,8 +1348,7 @@ make_ovl_node (struct ovl_data *lo, const char *path, struct ovl_layer *layer, c
cleanup_close int fd = TEMP_FAILURE_RETRY (openat (it->fd, npath, O_RDONLY|O_NONBLOCK|O_NOFOLLOW)); cleanup_close int fd = TEMP_FAILURE_RETRY (openat (it->fd, npath, O_RDONLY|O_NONBLOCK|O_NOFOLLOW));
if (fd < 0) if (fd < 0)
{ {
/* It is a symlink, read only the ino. */ if (errno != EPERM && fstatat (it->fd, npath, &st, AT_SYMLINK_NOFOLLOW) == 0)
if (errno == ELOOP && fstatat (it->fd, npath, &st, AT_SYMLINK_NOFOLLOW) == 0)
{ {
ret->tmp_ino = st.st_ino; ret->tmp_ino = st.st_ino;
mode = st.st_mode; mode = st.st_mode;

2
tests/fedora-installs.sh
View File

@ -47,6 +47,8 @@ docker run --rm -ti -v $(pwd)/merged:/merged centos:6 yum --installroot /merged
mkdir merged/a-directory mkdir merged/a-directory
python -c 'import socket; socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM).bind("merged/unix-socket")'
setfattr -n user.foo -v bar merged/a-directory setfattr -n user.foo -v bar merged/a-directory
getfattr -d merged/a-directory | grep bar getfattr -d merged/a-directory | grep bar
getfattr --only-values -n user.foo merged/a-directory | grep bar getfattr --only-values -n user.foo merged/a-directory | grep bar