mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 14:30:58 +07:00
svcrpc: complete svsk processing on cb receive failure
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:
parent
d6c558379a
commit
8985ef0b8a
@ -1143,11 +1143,8 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)
|
||||
|
||||
p = (__be32 *)rqstp->rq_arg.head[0].iov_base;
|
||||
calldir = p[1];
|
||||
if (calldir) {
|
||||
if (calldir)
|
||||
len = receive_cb_reply(svsk, rqstp);
|
||||
if (len < 0)
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* Reset TCP read info */
|
||||
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))
|
||||
set_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags);
|
||||
|
||||
if (len < 0)
|
||||
goto error;
|
||||
|
||||
svc_xprt_copy_addrs(rqstp, &svsk->sk_xprt);
|
||||
if (serv->sv_stats)
|
||||
|
Loading…
Reference in New Issue
Block a user