Commit 301e99ce authored Feb 28, 2010 by Neil Brown Committed by J. Bruce Fields Feb 28, 2010

nfsd: ensure sockets are closed on error



One the changes in commit d7979ae4 "svc: Move close processing to a
single place" is:

  err_delete:
-       svc_delete_socket(svsk);
+       set_bit(SK_CLOSE, &svsk->sk_flags);
        return -EAGAIN;

This is insufficient. The recvfrom methods must always call
svc_xprt_received on completion so that the socket gets re-queued if
there is any more work to do.  This particular path did not make that
call because it actually destroyed the svsk, making requeue pointless.
When the svc_delete_socket was change to just set a bit, we should have
added a call to svc_xprt_received,

This is the problem that b0401d72 attempted to fix, incorrectly.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

parent 1b644b6e

net/sunrpc/svcsock.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -968,6 +968,7 @@ static int svc_tcp_recv_record(struct svc_sock svsk, struct svc_rqst rqstp)
		return len;
		err_delete:
		set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);
		svc_xprt_received(&svsk->sk_xprt);
		err_again:
		return -EAGAIN;
		}

Admin message