Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9179c21d authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

ovl: don't fail with disconnected lower NFS 



NFS mounts can be disconnected from fs root.  Don't fail the overlapping
layer check because of this.

The check is not authoritative anyway, since topology can change during or
after the check.

Reported-by: default avatarAntti Antinoja <antti@fennosys.fi>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Fixes: 146d62e5 ("ovl: detect overlapping layers")
parent 941d935a

fs/overlayfs/super.c

+9 −17
Original line number Diff line number Diff line
@@ -1471,23 +1471,20 @@ static struct ovl_entry *ovl_get_lowerstack(struct super_block *sb, 
 * Check if this layer root is a descendant of:

 * - another layer of this overlayfs instance

 * - upper/work dir of any overlayfs instance

 * - a disconnected dentry (detached root)

 */

static int ovl_check_layer(struct super_block *sb, struct dentry *dentry,

			   const char *name)

{

	struct dentry *next, *parent;

	bool is_root = false;

	struct dentry *next = dentry, *parent;

	int err = 0;



	if (!dentry || dentry == dentry->d_sb->s_root)

	if (!dentry)

		return 0;



	next = dget(dentry);

	/* Walk back ancestors to fs root (inclusive) looking for traps */

	do {

	parent = dget_parent(next);

		is_root = (parent == next);



	/* Walk back ancestors to root (inclusive) looking for traps */

	while (!err && parent != next) {

		if (ovl_is_inuse(parent)) {

			err = -EBUSY;

			pr_err("overlayfs: %s path overlapping in-use upperdir/workdir\n",
@@ -1496,17 +1493,12 @@ static int ovl_check_layer(struct super_block *sb, struct dentry *dentry, 
			err = -ELOOP;

			pr_err("overlayfs: overlapping %s path\n", name);

		}

		dput(next);

		next = parent;

	} while (!err && !is_root);



	/* Did we really walk to fs root or found a detached root? */

	if (!err && next != dentry->d_sb->s_root) {

		err = -ESTALE;

		pr_err("overlayfs: disconnected %s path\n", name);

		parent = dget_parent(next);

		dput(next);

	}



	dput(next);

	dput(parent);



	return err;

}