From: Miklos Szeredi <miklos@szeredi.hu> To: rwheeler@redhat.com, avati@redhat.com, viro@ZenIV.linux.org.uk Cc: bfoster@redhat.com, dhowells@redhat.com, eparis@redhat.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, Trond.Myklebust@netapp.com, swhiteho@redhat.com, mszeredi@suse.cz Subject: [PATCH 2/4] vfs: check unlinked ancestors before mount Date: Tue, 6 Aug 2013 16:30:01 +0200 [thread overview] Message-ID: <1375799403-28544-3-git-send-email-miklos@szeredi.hu> (raw) In-Reply-To: <1375799403-28544-1-git-send-email-miklos@szeredi.hu> From: Miklos Szeredi <mszeredi@suse.cz> We check submounts before doing d_drop() on a non-empty directory dentry in NFS (have_submounts()). But we do not exclude a racing mount. Nor do we prevent mounts to be added to the disconnected subtree using relative paths after the d_drop(). This patch fixes these issues by checking for unlinked (unhashed, non-root) ancestors before proceeding with the mount. This is done after setting DCACHE_MOUNTED on the soon-to-be mountpoint and with the rename seqlock taken for write. This ensures that the only one of have_submounts() or has_unlinked_ancestor() can succeed. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> --- fs/dcache.c | 28 ++++++++++++++++++++++++++++ fs/internal.h | 1 + fs/namespace.c | 9 +++++++++ 3 files changed, 38 insertions(+) diff --git a/fs/dcache.c b/fs/dcache.c index ba429d9..eae7cc1 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1103,6 +1103,34 @@ rename_retry: } EXPORT_SYMBOL(have_submounts); +static bool __has_unlinked_ancestor(struct dentry *dentry) +{ + struct dentry *this; + + for (this = dentry; !IS_ROOT(this); this = this->d_parent) { + if (d_unhashed(this)) + return true; + } + return false; +} + +/* + * Called by mount code to check if the mountpoint is reachable (e.g. NFS can + * unhash a directory dentry and then the complete subtree can become + * unreachable). + */ +bool has_unlinked_ancestor(struct dentry *dentry) +{ + bool found; + + /* Need exclusion wrt. check_submounts_and_drop() */ + write_seqlock(&rename_lock); + found = __has_unlinked_ancestor(dentry); + write_sequnlock(&rename_lock); + + return found; +} + /* * Search the dentry child list of the specified parent, * and move any unused dentries to the end of the unused diff --git a/fs/internal.h b/fs/internal.h index 7c5f01c..d232355 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -126,6 +126,7 @@ extern int invalidate_inodes(struct super_block *, bool); * dcache.c */ extern struct dentry *__d_alloc(struct super_block *, const struct qstr *); +extern bool has_unlinked_ancestor(struct dentry *dentry); /* * read_write.c diff --git a/fs/namespace.c b/fs/namespace.c index 7b1ca9b..bb92a9c 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -634,6 +634,15 @@ static struct mountpoint *new_mountpoint(struct dentry *dentry) } dentry->d_flags |= DCACHE_MOUNTED; spin_unlock(&dentry->d_lock); + + if (has_unlinked_ancestor(dentry)) { + spin_lock(&dentry->d_lock); + dentry->d_flags &= ~DCACHE_MOUNTED; + spin_unlock(&dentry->d_lock); + kfree(mp); + return ERR_PTR(-ENOENT); + } + mp->m_dentry = dentry; mp->m_count = 1; list_add(&mp->m_hash, chain); -- 1.8.1.4
WARNING: multiple messages have this Message-ID (diff)
From: Miklos Szeredi <miklos-sUDqSbJrdHQHWmgEVkV9KA@public.gmane.org> To: rwheeler-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, avati-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, viro-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org Cc: bfoster-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, eparis-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org, swhiteho-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, mszeredi-AlSwsSmVLrQ@public.gmane.org Subject: [PATCH 2/4] vfs: check unlinked ancestors before mount Date: Tue, 6 Aug 2013 16:30:01 +0200 [thread overview] Message-ID: <1375799403-28544-3-git-send-email-miklos@szeredi.hu> (raw) In-Reply-To: <1375799403-28544-1-git-send-email-miklos-sUDqSbJrdHQHWmgEVkV9KA@public.gmane.org> From: Miklos Szeredi <mszeredi-AlSwsSmVLrQ@public.gmane.org> We check submounts before doing d_drop() on a non-empty directory dentry in NFS (have_submounts()). But we do not exclude a racing mount. Nor do we prevent mounts to be added to the disconnected subtree using relative paths after the d_drop(). This patch fixes these issues by checking for unlinked (unhashed, non-root) ancestors before proceeding with the mount. This is done after setting DCACHE_MOUNTED on the soon-to-be mountpoint and with the rename seqlock taken for write. This ensures that the only one of have_submounts() or has_unlinked_ancestor() can succeed. Signed-off-by: Miklos Szeredi <mszeredi-AlSwsSmVLrQ@public.gmane.org> --- fs/dcache.c | 28 ++++++++++++++++++++++++++++ fs/internal.h | 1 + fs/namespace.c | 9 +++++++++ 3 files changed, 38 insertions(+) diff --git a/fs/dcache.c b/fs/dcache.c index ba429d9..eae7cc1 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1103,6 +1103,34 @@ rename_retry: } EXPORT_SYMBOL(have_submounts); +static bool __has_unlinked_ancestor(struct dentry *dentry) +{ + struct dentry *this; + + for (this = dentry; !IS_ROOT(this); this = this->d_parent) { + if (d_unhashed(this)) + return true; + } + return false; +} + +/* + * Called by mount code to check if the mountpoint is reachable (e.g. NFS can + * unhash a directory dentry and then the complete subtree can become + * unreachable). + */ +bool has_unlinked_ancestor(struct dentry *dentry) +{ + bool found; + + /* Need exclusion wrt. check_submounts_and_drop() */ + write_seqlock(&rename_lock); + found = __has_unlinked_ancestor(dentry); + write_sequnlock(&rename_lock); + + return found; +} + /* * Search the dentry child list of the specified parent, * and move any unused dentries to the end of the unused diff --git a/fs/internal.h b/fs/internal.h index 7c5f01c..d232355 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -126,6 +126,7 @@ extern int invalidate_inodes(struct super_block *, bool); * dcache.c */ extern struct dentry *__d_alloc(struct super_block *, const struct qstr *); +extern bool has_unlinked_ancestor(struct dentry *dentry); /* * read_write.c diff --git a/fs/namespace.c b/fs/namespace.c index 7b1ca9b..bb92a9c 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -634,6 +634,15 @@ static struct mountpoint *new_mountpoint(struct dentry *dentry) } dentry->d_flags |= DCACHE_MOUNTED; spin_unlock(&dentry->d_lock); + + if (has_unlinked_ancestor(dentry)) { + spin_lock(&dentry->d_lock); + dentry->d_flags &= ~DCACHE_MOUNTED; + spin_unlock(&dentry->d_lock); + kfree(mp); + return ERR_PTR(-ENOENT); + } + mp->m_dentry = dentry; mp->m_count = 1; list_add(&mp->m_hash, chain); -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2013-08-06 14:31 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-08-06 14:29 [PATCH 0/4] [RFC] safely drop directory dentry on failed revalidate Miklos Szeredi 2013-08-06 14:29 ` Miklos Szeredi 2013-08-06 14:30 ` [PATCH 1/4] vfs: check submounts and drop atomically Miklos Szeredi 2013-08-06 14:30 ` Miklos Szeredi [this message] 2013-08-06 14:30 ` [PATCH 2/4] vfs: check unlinked ancestors before mount Miklos Szeredi 2013-08-06 16:08 ` Miklos Szeredi 2013-08-06 14:30 ` [PATCH 3/4] fuse: use d_materialise_unique() Miklos Szeredi 2013-08-06 14:30 ` [PATCH 4/4] fuse: drop dentry on failed revalidate Miklos Szeredi 2013-08-06 14:30 ` Miklos Szeredi 2013-08-06 20:06 ` Anand Avati 2013-08-07 15:44 ` Miklos Szeredi 2013-08-07 15:44 ` Miklos Szeredi 2013-08-07 16:31 ` Anand Avati 2013-08-07 16:31 ` Anand Avati 2013-08-08 14:46 ` Miklos Szeredi 2013-08-08 14:46 ` Miklos Szeredi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1375799403-28544-3-git-send-email-miklos@szeredi.hu \ --to=miklos@szeredi.hu \ --cc=Trond.Myklebust@netapp.com \ --cc=avati@redhat.com \ --cc=bfoster@redhat.com \ --cc=dhowells@redhat.com \ --cc=eparis@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=mszeredi@suse.cz \ --cc=rwheeler@redhat.com \ --cc=swhiteho@redhat.com \ --cc=viro@ZenIV.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.