1 files changed, 6 insertions, 3 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index ea14314331b0..522b06849f86 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -1240,10 +1240,13 @@ call_decode(struct rpc_task *task)
                         task->tk_status);
         return;
 out_retry:
-        req->rq_received = req->rq_private_buf.len = 0;
         task->tk_status = 0;
-        if (task->tk_client->cl_discrtry)
-                xprt_force_disconnect(task->tk_xprt);
+        /* Note: call_verify() may have freed the RPC slot */
+        if (task->tk_rqstp == req) {
+                req->rq_received = req->rq_private_buf.len = 0;
+                if (task->tk_client->cl_discrtry)
+                        xprt_force_disconnect(task->tk_xprt);
+        }
 }
 
 /*