| From 301e99ce4a2f42a317129230fd42e6cd874c64b0 Mon Sep 17 00:00:00 2001 |
| From: Neil Brown <neilb@suse.de> |
| Date: Sun, 28 Feb 2010 22:01:05 -0500 |
| Subject: nfsd: ensure sockets are closed on error |
| |
| From: Neil Brown <neilb@suse.de> |
| |
| commit 301e99ce4a2f42a317129230fd42e6cd874c64b0 upstream. |
| |
| One the changes in commit d7979ae4a "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 b0401d7253 attempted to fix, incorrectly. |
| |
| Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/sunrpc/svcsock.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/net/sunrpc/svcsock.c |
| +++ b/net/sunrpc/svcsock.c |
| @@ -968,6 +968,7 @@ static int svc_tcp_recv_record(struct sv |
| return len; |
| err_delete: |
| set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags); |
| + svc_xprt_received(&svsk->sk_xprt); |
| err_again: |
| return -EAGAIN; |
| } |