Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751971AbcKNN2g (ORCPT ); Mon, 14 Nov 2016 08:28:36 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33550 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751443AbcKNN1U (ORCPT ); Mon, 14 Nov 2016 08:27:20 -0500 From: Quorum Laval To: miklos@szeredi.hu Cc: vmlinuz386@gmail.com, linux-unionfs@vger.kernel.org, linux-kernel@vger.kernel.org, quorum.laval@gmail.com Subject: [PATCH] ovl: fix issue with nftw(3) with FTW_MOUNT flag set Date: Mon, 14 Nov 2016 14:27:13 +0100 Message-Id: <1479130033-8357-1-git-send-email-quorum.laval@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1181 Lines: 42 >From glibc2-24/io/ftw.c: if (result == 0 && (flag == FTW_NS || !(data->flags & FTW_MOUNT) || st.st_dev == data->dev)) 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 Reported-by: Gerardo Exequiel Pozzi --- 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