ovl: don't traverse automount points

NFS and other distributed filesystems may place automount points in the
tree.  Previoulsy overlayfs refused to mount such filesystems types (based
on the existence of the .d_automount callback), even if the actual export
didn't have any automount points.

It cannot be determined in advance whether the filesystem has automount
points or not.  The solution is to allow fs with .d_automount but refuse to
traverse any automount points encountered.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
This commit is contained in:
Miklos Szeredi 2015-06-22 13:53:48 +02:00
parent b953c0d234
commit a6f15d9a75
1 changed files with 6 additions and 2 deletions

View File

@ -303,6 +303,10 @@ static inline struct dentry *ovl_lookup_real(struct dentry *dir,
} else if (!dentry->d_inode) { } else if (!dentry->d_inode) {
dput(dentry); dput(dentry);
dentry = NULL; dentry = NULL;
} else if (dentry->d_flags & DCACHE_MANAGED_DENTRY) {
dput(dentry);
/* Don't support traversing automounts */
dentry = ERR_PTR(-EREMOTE);
} }
return dentry; return dentry;
} }
@ -700,12 +704,12 @@ static bool ovl_is_allowed_fs_type(struct dentry *root)
/* /*
* We don't support: * We don't support:
* - automount filesystems * - autofs
* - filesystems with revalidate (FIXME for lower layer) * - filesystems with revalidate (FIXME for lower layer)
* - filesystems with case insensitive names * - filesystems with case insensitive names
*/ */
if (dop && if (dop &&
(dop->d_manage || dop->d_automount || (dop->d_manage ||
dop->d_revalidate || dop->d_weak_revalidate || dop->d_revalidate || dop->d_weak_revalidate ||
dop->d_compare || dop->d_hash)) { dop->d_compare || dop->d_hash)) {
return false; return false;