From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16E681DEFF6; Tue, 8 Oct 2024 13:26:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728393998; cv=none; b=SadHaL+Rc1vOTq80d96mIs1zGmiueVcXgDNbR3l/CZVioeqNwP5467U3TOMlzqyQHVXca35MqteROXCHfcx+XfOaphQ2hWxPbJNrO2QjICZ9FRc/M/4fUmA0KniUF/nLipQkeV4xTUuQIEMwallFq8euPkWBI95jvue7zZi2L+M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728393998; c=relaxed/simple; bh=VpHvwLLpSqhEhNLfQIII88c5CQJEPNs3WsiLKtHYNg8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=De3N4g2YEa794I3tRSRca3hsHTxxB76FczbXMHOWsdxzQbbdmaHsSGQE4nVIazNMIuAfrhv0GVuYUd2jaJoHl+jsf4KdgjLBGKBr36R83E+CM22Uw2Ye8NiQ4FNAuAXeMBl2c53wmmWovsEAxZjoPN32hulBstWMwwqkx0USI2s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cjYQzSAp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cjYQzSAp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78AC5C4CEC7; Tue, 8 Oct 2024 13:26:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728393997; bh=VpHvwLLpSqhEhNLfQIII88c5CQJEPNs3WsiLKtHYNg8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cjYQzSApBF7Klp27hOPN6sRnLuSm6ZSITpOh3p8vAx1VNqTV7efGcpMflTu1JKx/V a6NRujijwGgT3KOinpppBmEAUK+jb1Whpmf4ezGGdtGsABD3zhkfoHLis87jf47e+5 hkSxgtEm+YCEzYTwtM/vp6QYX3iTzpGs+TWyCiUU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Patrick Donnelly , Ilya Dryomov Subject: [PATCH 6.6 316/386] ceph: fix cap ref leak via netfs init_request Date: Tue, 8 Oct 2024 14:09:21 +0200 Message-ID: <20241008115641.821726249@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008115629.309157387@linuxfoundation.org> References: <20241008115629.309157387@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Patrick Donnelly commit ccda9910d8490f4fb067131598e4b2e986faa5a0 upstream. Log recovered from a user's cluster: <7>[ 5413.970692] ceph: get_cap_refs 00000000958c114b ret 1 got Fr <7>[ 5413.970695] ceph: start_read 00000000958c114b, no cache cap ... <7>[ 5473.934609] ceph: my wanted = Fr, used = Fr, dirty - <7>[ 5473.934616] ceph: revocation: pAsLsXsFr -> pAsLsXs (revoking Fr) <7>[ 5473.934632] ceph: __ceph_caps_issued 00000000958c114b cap 00000000f7784259 issued pAsLsXs <7>[ 5473.934638] ceph: check_caps 10000000e68.fffffffffffffffe file_want - used Fr dirty - flushing - issued pAsLsXs revoking Fr retain pAsLsXsFsr AUTHONLY NOINVAL FLUSH_FORCE The MDS subsequently complains that the kernel client is late releasing caps. Approximately, a series of changes to this code by commits 49870056005c ("ceph: convert ceph_readpages to ceph_readahead"), 2de160417315 ("netfs: Change ->init_request() to return an error code") and a5c9dc445139 ("ceph: Make ceph_init_request() check caps on readahead") resulted in subtle resource cleanup to be missed. The main culprit is the change in error handling in 2de160417315 which meant that a failure in init_request() would no longer cause cleanup to be called. That would prevent the ceph_put_cap_refs() call which would cleanup the leaked cap ref. Cc: stable@vger.kernel.org Fixes: a5c9dc445139 ("ceph: Make ceph_init_request() check caps on readahead") Link: https://tracker.ceph.com/issues/67008 Signed-off-by: Patrick Donnelly Reviewed-by: Ilya Dryomov Signed-off-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- fs/ceph/addr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -483,8 +483,11 @@ static int ceph_init_request(struct netf rreq->netfs_priv = priv; out: - if (ret < 0) + if (ret < 0) { + if (got) + ceph_put_cap_refs(ceph_inode(inode), got); kfree(priv); + } return ret; }