diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2021-08-25 21:33:14 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2021-08-25 22:58:09 +0200 |
| commit | 062b829c52ef4ed5df14f4850fc07651bb7c3b33 (patch) | |
| tree | 93661da46929b3da26d0fddd2e0f46c5a2646dbd /net/sunrpc/svc_xprt.c | |
| parent | Linux 5.14-rc7 (diff) | |
| download | linux-062b829c52ef4ed5df14f4850fc07651bb7c3b33.tar.xz linux-062b829c52ef4ed5df14f4850fc07651bb7c3b33.zip | |
SUNRPC: Fix XPT_BUSY flag leakage in svc_handle_xprt()...
If the attempt to reserve a slot fails, we currently leak the XPT_BUSY
flag on the socket. Among other things, this make it impossible to close
the socket.
Fixes: 82011c80b3ec ("SUNRPC: Move svc_xprt_received() call sites")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net/sunrpc/svc_xprt.c')
| -rw-r--r-- | net/sunrpc/svc_xprt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index d66a8e44a1ae..dbb41821b1b8 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -835,7 +835,8 @@ static int svc_handle_xprt(struct svc_rqst *rqstp, struct svc_xprt *xprt) rqstp->rq_stime = ktime_get(); rqstp->rq_reserved = serv->sv_max_mesg; atomic_add(rqstp->rq_reserved, &xprt->xpt_reserved); - } + } else + svc_xprt_received(xprt); out: trace_svc_handle_xprt(xprt, len); return len; |