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

Commit a701ae9a authored by chenying's avatar chenying Committed by Greg Kroah-Hartman
Browse files

ovl: fix BUG_ON() in may_delete() when called from ovl_cleanup() 



commit 52d5a0c6bd8a89f460243ed937856354f8f253a3 upstream.

If function ovl_instantiate() returns an error, ovl_cleanup will be called
and try to remove newdentry from wdir, but the newdentry has been moved to
udir at this time.  This will causes BUG_ON(victim->d_parent->d_inode !=
dir) in fs/namei.c:may_delete.

Signed-off-by: default avatarchenying <chenying.kernel@bytedance.com>
Fixes: 01b39dcc ("ovl: use inode_insert5() to hash a newly created inode")
Link: https://lore.kernel.org/linux-unionfs/e6496a94-a161-dc04-c38a-d2544633acb4@bytedance.com/


Cc: <stable@vger.kernel.org> # v4.18
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1a2f728b

fs/overlayfs/dir.c

+4 −2
Original line number Diff line number Diff line
@@ -513,8 +513,10 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode, 
			goto out_cleanup;

	}

	err = ovl_instantiate(dentry, inode, newdentry, hardlink);

	if (err)

		goto out_cleanup;

	if (err) {

		ovl_cleanup(udir, newdentry);

		dput(newdentry);

	}

out_dput:

	dput(upper);

out_unlock: