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

Commit 6ab4fd50 authored by Xiubo Li's avatar Xiubo Li Committed by Greg Kroah-Hartman
Browse files

ceph: fix deadlock or deadcode of misusing dget() 

[ Upstream commit b493ad718b1f0357394d2cdecbf00a44a36fa085 ]

The lock order is incorrect between denty and its parent, we should
always make sure that the parent get the lock first.

But since this deadcode is never used and the parent dir will always
be set from the callers, let's just remove it.

Link: https://lore.kernel.org/r/20231116081919.GZ1957730@ZenIV


Reported-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ecd7744a

fs/ceph/caps.c

+3 −6
Original line number Diff line number Diff line
@@ -4304,12 +4304,14 @@ int ceph_encode_dentry_release(void **p, struct dentry *dentry, 
			       struct inode *dir,

			       int mds, int drop, int unless)

{

	struct dentry *parent = NULL;

	struct ceph_mds_request_release *rel = *p;

	struct ceph_dentry_info *di = ceph_dentry(dentry);

	int force = 0;

	int ret;



	/* This shouldn't happen */

	BUG_ON(!dir);



	/*

	 * force an record for the directory caps if we have a dentry lease.

	 * this is racy (can't take i_ceph_lock and d_lock together), but it
@@ -4319,14 +4321,9 @@ int ceph_encode_dentry_release(void **p, struct dentry *dentry, 
	spin_lock(&dentry->d_lock);

	if (di->lease_session && di->lease_session->s_mds == mds)

		force = 1;

	if (!dir) {

		parent = dget(dentry->d_parent);

		dir = d_inode(parent);

	}

	spin_unlock(&dentry->d_lock);



	ret = ceph_encode_inode_release(p, dir, mds, drop, unless, force);

	dput(parent);



	spin_lock(&dentry->d_lock);

	if (ret && di->lease_session && di->lease_session->s_mds == mds) {