leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svcrpc: complete svsk processing on cb receive failure

Browse Source 
Currently when there's some failure to receive a callback (because we
couldn't find a matching xid, for example), we exit svc_recv with
sk_tcplen still set but without any pages saved with the socket.  This
will cause a crash later in svc_tcp_restore_pages.

Instead, make sure we reset that tcp information whether the callback
received failed or succeeded.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields
2011-04-09 10:03:10 -04:00
parent d6c558379a
commit 8985ef0b8a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/sunrpc/svcsock.c
View File

@@ -1143,11 +1143,8 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
p = (__be32 *)rqstp->rq_arg.head[0].iov_base; p = (__be32 *)rqstp->rq_arg.head[0].iov_base;
calldir = p[1]; calldir = p[1];
if (calldir) { if (calldir)
len = receive_cb_reply(svsk, rqstp); len = receive_cb_reply(svsk, rqstp);
if (len < 0)
goto error;
}
/* Reset TCP read info */ /* Reset TCP read info */
svsk->sk_reclen = 0; svsk->sk_reclen = 0;
@@ -1156,6 +1153,8 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
if (svc_recv_available(svsk) > sizeof(rpc_fraghdr)) if (svc_recv_available(svsk) > sizeof(rpc_fraghdr))
set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags); set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
if (len < 0)
goto error;
svc_xprt_copy_addrs(rqstp, &svsk->sk_xprt); svc_xprt_copy_addrs(rqstp, &svsk->sk_xprt);
if (serv->sv_stats) if (serv->sv_stats)