From: Dan Carpenter <dan.carpenter@linaro.org>
Date: Wed, 2 Apr 2025 11:02:40 +0000 (+0300)
Subject: nfs: Add missing release on error in nfs_lock_and_join_requests()
X-Git-Tag: v6.12.23~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb532ac40dc87f27d8e680c1a9c2801cbeae6e6a;p=thirdparty%2Fkernel%2Fstable.git

nfs: Add missing release on error in nfs_lock_and_join_requests()

[ Upstream commit 8e5419d6542fdf2dca9a0acdef2b8255f0e4ba69 ]

Call nfs_release_request() on this error path before returning.

Fixes: c3f2235782c3 ("nfs: fold nfs_folio_find_and_lock_request into nfs_lock_and_join_requests")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/r/3aaaa3d5-1c8a-41e4-98c7-717801ddd171@stanley.mountain
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 82ae2b85d393c..8ff8db09a1e06 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -579,8 +579,10 @@ retry:
 
 	while (!nfs_lock_request(head)) {
 		ret = nfs_wait_on_request(head);
-		if (ret < 0)
+		if (ret < 0) {
+			nfs_release_request(head);
 			return ERR_PTR(ret);
+		}
 	}
 
 	/* Ensure that nobody removed the request before we locked it */