[PATCH] ovl: fix issue with nftw(3) with FTW_MOUNT flag set
From: Quorum Laval
Date: Mon Nov 14 2016 - 08:30:36 EST
>From glibc2-24/io/ftw.c:
<snippet>
if (result == 0
&& (flag == FTW_NS
|| !(data->flags & FTW_MOUNT) || st.st_dev == data->dev))
<snippet>
st.st_dev == data->dev is false in the cases of non-directory objects,
since st_dev is reported from upper/lower filesystem and ->dev is
reported from overlayfs [0]. So when FTW_NS and FTW_MOUNT are
positionned, non-directory objects will not be reported by nftw(3) [1]. The patch
fixes this.
[0] Documentation/filesystems/overlayfs.txt
[1] https://bugzilla.kernel.org/show_bug.cgi?id=114951
Signed-off-by: Quorum Laval <quorum.laval@xxxxxxxxx>
Reported-by: Gerardo Exequiel Pozzi <vmlinuz386@xxxxxxxxx>
---
fs/overlayfs/inode.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 7fb53d0..565a7a9 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -116,6 +116,10 @@ static int ovl_getattr(struct vfsmount *mnt, struct dentry *dentry,
old_cred = ovl_override_creds(dentry->d_sb);
err = vfs_getattr(&realpath, stat);
revert_creds(old_cred);
+
+ stat->dev = dentry->d_sb->s_dev;
+ stat->ino = dentry->d_inode->i_ino;
+
return err;
}
--
2.7.4