Commit e2496105 authored Sep 27, 2018 by Yan, Zheng Committed by Greg Kroah-Hartman Nov 21, 2018

Revert "ceph: fix dentry leak in splice_dentry()"



commit efe328230dc01aa0b1269aad0b5fae73eea4677a upstream.

This reverts commit 8b8f53af.

splice_dentry() is used by three places. For two places, req->r_dentry
is passed to splice_dentry(). In the case of error, req->r_dentry does
not get updated. So splice_dentry() should not drop reference.

Cc: stable@vger.kernel.org # 4.18+
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 542705af

fs/ceph/inode.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1132,8 +1132,12 @@ static struct dentry splice_dentry(struct dentry dn, struct inode *in)
		if (IS_ERR(realdn)) {
		pr_err("splice_dentry error %ld %p inode %p ino %llx.%llx\n",
		PTR_ERR(realdn), dn, in, ceph_vinop(in));
		dput(dn);
		dn = realdn; /* note realdn contains the error */
		dn = realdn;
		/*
		* Caller should release 'dn' in the case of error.
		* If 'req->r_dentry' is passed to this function,
		* caller should leave 'req->r_dentry' untouched.
		*/
		goto out;
		} else if (realdn) {
		dout("dn %p (%d) spliced with %p (%d) "