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 1DA431E0083; Wed, 6 Nov 2024 13:01:35 +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=1730898095; cv=none; b=PoHEI/Q1vGZashR64lpKAC3ipH+otuKpjfQCijDH5KPieAxlp0vNviH2a5qoNjqEl5/wuyXcEtiMQ444TNgj81/B/0axuJbIQFsS+zTQmO34uqHzTrc/4GD2WQJx5q2NdH0oZqTh2pS7ZaKtK3MH4JtQLN2rcTqwuoyfUnq+R0E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730898095; c=relaxed/simple; bh=VUiLZrvBzalNNjCsUkHrSrzShajnkDG4mXwD/q6C/FM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MHIBkk4z9DFZaOZRd5UgkSi0vX3KJvjVp1spVDda9kEhZrROuIavcuzqBC80PapnTEBcwCRSf+oUZT2tbVm9YGbjNzUt7I92l8nY3yqiWcb0Yw7eOg/GSf2MuyT3X51aKQW76vrWjM760d2hedJVQ0mwX368984Pl2RkSWxGijc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cUicoLH8; 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="cUicoLH8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 829EDC4CECD; Wed, 6 Nov 2024 13:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730898094; bh=VUiLZrvBzalNNjCsUkHrSrzShajnkDG4mXwD/q6C/FM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cUicoLH8tQqMRrK50bjTSI7uQjht71nLTOLVRbGq3kj2WJ3FgmHPDYn5g1y2HIQdR OzYRjqBc50mpJ2u9eiK9LWvsofWNGzZlysQ6eXXlvxYrHEoO+HCqoIQOcuuw9na9Iu R9UPIqh/4LA0hHC5gJnCdDGmfIibun9MWe2rEr6s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Guoqing Jiang , Chuck Lever , Sasha Levin , Jeff Layton Subject: [PATCH 5.4 123/462] nfsd: call cache_put if xdr_reserve_space returns NULL Date: Wed, 6 Nov 2024 13:00:16 +0100 Message-ID: <20241106120334.545394728@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120331.497003148@linuxfoundation.org> References: <20241106120331.497003148@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Guoqing Jiang [ Upstream commit d078cbf5c38de83bc31f83c47dcd2184c04a50c7 ] If not enough buffer space available, but idmap_lookup has triggered lookup_fn which calls cache_get and returns successfully. Then we missed to call cache_put here which pairs with cache_get. Fixes: ddd1ea563672 ("nfsd4: use xdr_reserve_space in attribute encoding") Signed-off-by: Guoqing Jiang Reviwed-by: Jeff Layton Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- fs/nfsd/nfs4idmap.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c index d1f285245af80..06d7404354b99 100644 --- a/fs/nfsd/nfs4idmap.c +++ b/fs/nfsd/nfs4idmap.c @@ -566,6 +566,7 @@ static __be32 idmap_id_to_name(struct xdr_stream *xdr, .id = id, .type = type, }; + __be32 status = nfs_ok; __be32 *p; int ret; struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); @@ -578,12 +579,16 @@ static __be32 idmap_id_to_name(struct xdr_stream *xdr, return nfserrno(ret); ret = strlen(item->name); WARN_ON_ONCE(ret > IDMAP_NAMESZ); + p = xdr_reserve_space(xdr, ret + 4); - if (!p) - return nfserr_resource; - p = xdr_encode_opaque(p, item->name, ret); + if (unlikely(!p)) { + status = nfserr_resource; + goto out_put; + } + xdr_encode_opaque(p, item->name, ret); +out_put: cache_put(&item->h, nn->idtoname_cache); - return 0; + return status; } static bool -- 2.43.0