Received-SPF: pass (google.com: domain of linux-nfs+bounces-3589-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Mike Snitzer <snitzer@kernel.org>
To: linux-nfs@vger.kernel.org
Cc: Jeff Layton <jlayton@kernel.org>,
	Chuck Lever <chuck.lever@oracle.com>,
	Trond Myklebust <trondmy@hammerspace.com>,
	snitzer@hammerspace.com
Subject: [for-6.11 PATCH 04/29] sunrpc: handle NULL req->defer in cache_defer_req
Date: Fri,  7 Jun 2024 10:26:21 -0400
Message-ID: <20240607142646.20924-5-snitzer@kernel.org>
In-Reply-To: <20240607142646.20924-1-snitzer@kernel.org>
References: <20240607142646.20924-1-snitzer@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

From: Weston Andros Adamson <dros@primarydata.com>

Dont crash with a NULL pointer dereference when req->defer isn't
set. This is needed for the localio path.

Signed-off-by: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: Lance Shelton <lance.shelton@hammerspace.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
---
 net/sunrpc/cache.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 95ff74706104..b757b891382c 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -714,6 +714,8 @@ static bool cache_defer_req(struct cache_req *req, struct cache_head *item)
 			return false;
 	}
 
+	if (!req->defer)
+		return false;
 	dreq = req->defer(req);
 	if (dreq == NULL)
 		return false;
-- 
2.44.0