|
 |
ffb308 |
diff -up libtirpc-1.1.4/src/svc_vc.c.orig libtirpc-1.1.4/src/svc_vc.c
|
|
|
ffb308 |
--- libtirpc-1.1.4/src/svc_vc.c.orig 2018-08-27 10:06:49.000000000 -0400
|
|
|
ffb308 |
+++ libtirpc-1.1.4/src/svc_vc.c 2019-07-24 11:51:32.191485387 -0400
|
|
|
ffb308 |
@@ -502,9 +502,14 @@ read_vc(xprtp, buf, len)
|
|
|
ffb308 |
cfp = (struct cf_conn *)xprt->xp_p1;
|
|
|
ffb308 |
|
|
|
ffb308 |
if (cfp->nonblock) {
|
|
|
ffb308 |
+ /* Since len == 0 is returned on zero length
|
|
|
ffb308 |
+ * read or EOF errno needs to be reset before
|
|
|
ffb308 |
+ * the read
|
|
|
ffb308 |
+ */
|
|
|
ffb308 |
+ errno = 0;
|
|
|
ffb308 |
len = read(sock, buf, (size_t)len);
|
|
|
ffb308 |
if (len < 0) {
|
|
|
ffb308 |
- if (errno == EAGAIN)
|
|
|
ffb308 |
+ if (errno == EAGAIN || errno == EWOULDBLOCK)
|
|
|
ffb308 |
len = 0;
|
|
|
ffb308 |
else
|
|
|
ffb308 |
goto fatal_err;
|
|
|
ffb308 |
diff -up libtirpc-1.1.4/src/xdr_rec.c.orig libtirpc-1.1.4/src/xdr_rec.c
|
|
|
ffb308 |
--- libtirpc-1.1.4/src/xdr_rec.c.orig 2018-08-27 10:06:49.000000000 -0400
|
|
|
ffb308 |
+++ libtirpc-1.1.4/src/xdr_rec.c 2019-07-24 11:51:32.191485387 -0400
|
|
|
ffb308 |
@@ -61,6 +61,7 @@
|
|
|
ffb308 |
#include <rpc/svc.h>
|
|
|
ffb308 |
#include <rpc/clnt.h>
|
|
|
ffb308 |
#include <stddef.h>
|
|
|
ffb308 |
+#include <errno.h>
|
|
|
ffb308 |
#include "rpc_com.h"
|
|
|
ffb308 |
static bool_t xdrrec_getlong(XDR *, long *);
|
|
|
ffb308 |
static bool_t xdrrec_putlong(XDR *, const long *);
|
|
|
ffb308 |
@@ -537,7 +538,13 @@ __xdrrec_getrec(xdrs, statp, expectdata)
|
|
|
ffb308 |
n = rstrm->readit(rstrm->tcp_handle, rstrm->in_hdrp,
|
|
|
ffb308 |
(int)sizeof (rstrm->in_header) - rstrm->in_hdrlen);
|
|
|
ffb308 |
if (n == 0) {
|
|
|
ffb308 |
- *statp = expectdata ? XPRT_DIED : XPRT_IDLE;
|
|
|
ffb308 |
+ /* EAGAIN or EWOULDBLOCK means a zero length
|
|
|
ffb308 |
+ * read not an EOF.
|
|
|
ffb308 |
+ */
|
|
|
ffb308 |
+ if (errno == EAGAIN || errno == EWOULDBLOCK)
|
|
|
ffb308 |
+ *statp = XPRT_IDLE;
|
|
|
ffb308 |
+ else
|
|
|
ffb308 |
+ *statp = expectdata ? XPRT_DIED : XPRT_IDLE;
|
|
|
ffb308 |
return FALSE;
|
|
|
ffb308 |
}
|
|
|
ffb308 |
if (n < 0) {
|
|
|
ffb308 |
@@ -564,6 +571,7 @@ __xdrrec_getrec(xdrs, statp, expectdata)
|
|
|
ffb308 |
rstrm->in_header &= ~LAST_FRAG;
|
|
|
ffb308 |
rstrm->last_frag = TRUE;
|
|
|
ffb308 |
}
|
|
|
ffb308 |
+ rstrm->in_haveheader = 1;
|
|
|
ffb308 |
}
|
|
|
ffb308 |
|
|
|
ffb308 |
n = rstrm->readit(rstrm->tcp_handle,
|
|
|
ffb308 |
@@ -576,7 +584,13 @@ __xdrrec_getrec(xdrs, statp, expectdata)
|
|
|
ffb308 |
}
|
|
|
ffb308 |
|
|
|
ffb308 |
if (n == 0) {
|
|
|
ffb308 |
- *statp = expectdata ? XPRT_DIED : XPRT_IDLE;
|
|
|
ffb308 |
+ /* EAGAIN or EWOULDBLOCK means a zero length
|
|
|
ffb308 |
+ * read not an EOF.
|
|
|
ffb308 |
+ */
|
|
|
ffb308 |
+ if (errno == EAGAIN || errno == EWOULDBLOCK)
|
|
|
ffb308 |
+ *statp = XPRT_IDLE;
|
|
|
ffb308 |
+ else
|
|
|
ffb308 |
+ *statp = expectdata ? XPRT_DIED : XPRT_IDLE;
|
|
|
ffb308 |
return FALSE;
|
|
|
ffb308 |
}
|
|
|
ffb308 |
|