Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad46ccf0 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

svcrpc: delay minimum-rpc-size check till later 



Soon we want to support multiple fragments, in which case it may be
legal for a single fragment to be smaller than 8 bytes, so we'll want to
delay this check till we've reached the last fragment.

Also fix an outdated comment.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent cc248d4b

net/sunrpc/svcsock.c

+7 −9
Original line number Original line Diff line number Diff line
@@ -921,10 +921,8 @@ static void svc_tcp_clear_pages(struct svc_sock *svsk) 
}

}





/*

/*

 * Receive data.

 * Receive fragment record header.

 * If we haven't gotten the record length yet, get the next four bytes.

 * If we haven't gotten the record length yet, get the next four bytes.

 * Otherwise try to gobble up as much as possible up to the complete

 * record length.

 */

 */

static int svc_tcp_recv_record(struct svc_sock *svsk, struct svc_rqst *rqstp)

static int svc_tcp_recv_record(struct svc_sock *svsk, struct svc_rqst *rqstp)

{

{
@@ -968,9 +966,6 @@ static int svc_tcp_recv_record(struct svc_sock *svsk, struct svc_rqst *rqstp) 
		}

		}

	}

	}





	if (svc_sock_reclen(svsk) < 8)

		goto err_delete; /* client is nuts. */



	return svc_sock_reclen(svsk);

	return svc_sock_reclen(svsk);

error:

error:

	dprintk("RPC: TCP recv_record got %d\n", len);

	dprintk("RPC: TCP recv_record got %d\n", len);
@@ -1076,12 +1071,15 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp) 
	if (len != want) {

	if (len != want) {

		svc_tcp_save_pages(svsk, rqstp);

		svc_tcp_save_pages(svsk, rqstp);

		if (len < 0 && len != -EAGAIN)

		if (len < 0 && len != -EAGAIN)

			goto err_other;

			goto err_delete;

		dprintk("svc: incomplete TCP record (%d of %d)\n",

		dprintk("svc: incomplete TCP record (%d of %d)\n",

			svsk->sk_tcplen, svc_sock_reclen(svsk));

			svsk->sk_tcplen, svc_sock_reclen(svsk));

		goto err_noclose;

		goto err_noclose;

	}

	}





	if (svc_sock_reclen(svsk) < 8)

		goto err_delete; /* client is nuts. */



	rqstp->rq_arg.len = svc_sock_reclen(svsk);

	rqstp->rq_arg.len = svc_sock_reclen(svsk);

	rqstp->rq_arg.page_base = 0;

	rqstp->rq_arg.page_base = 0;

	if (rqstp->rq_arg.len <= rqstp->rq_arg.head[0].iov_len) {

	if (rqstp->rq_arg.len <= rqstp->rq_arg.head[0].iov_len) {
@@ -1117,10 +1115,10 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp) 




error:

error:

	if (len != -EAGAIN)

	if (len != -EAGAIN)

		goto err_other;

		goto err_delete;

	dprintk("RPC: TCP recvfrom got EAGAIN\n");

	dprintk("RPC: TCP recvfrom got EAGAIN\n");

	return 0;

	return 0;

err_other:

err_delete:

	printk(KERN_NOTICE "%s: recvfrom returned errno %d\n",

	printk(KERN_NOTICE "%s: recvfrom returned errno %d\n",

	       svsk->sk_xprt.xpt_server->sv_name, -len);

	       svsk->sk_xprt.xpt_server->sv_name, -len);

	set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);

	set_bit(XPT_CLOSE, &svsk->sk_xprt.xpt_flags);