summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/libnsl/rpc/rpcb_prot.c45
-rw-r--r--usr/src/uts/common/avs/ns/rdc/rdc_prot.x1
-rw-r--r--usr/src/uts/common/avs/ns/rdc/rdc_svc.c22
-rw-r--r--usr/src/uts/common/rpc/rpcb_prot.c69
4 files changed, 81 insertions, 56 deletions
diff --git a/usr/src/lib/libnsl/rpc/rpcb_prot.c b/usr/src/lib/libnsl/rpc/rpcb_prot.c
index d81e7e19f8..464ce69743 100644
--- a/usr/src/lib/libnsl/rpc/rpcb_prot.c
+++ b/usr/src/lib/libnsl/rpc/rpcb_prot.c
@@ -33,8 +33,6 @@
* California.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* XDR routines for the rpcbinder version 3.
*/
@@ -180,7 +178,7 @@ xdr_rpcb_entry_list_ptr(XDR *xdrs, rpcb_entry_list_ptr *rp)
next = (*rp)->rpcb_entry_next;
if (!xdr_reference(xdrs, (caddr_t *)rp,
(uint_t)sizeof (rpcb_entry_list),
- (xdrproc_t)xdr_rpcb_entry))
+ (xdrproc_t)xdr_rpcb_entry))
return (FALSE);
if (freeing) {
next_copy = next;
@@ -256,8 +254,43 @@ xdr_rpcb_rmtcallres(XDR *xdrs, struct r_rpcb_rmtcallres *objp)
bool_t
xdr_netbuf(XDR *xdrs, struct netbuf *objp)
{
- if (!xdr_u_int(xdrs, (uint_t *)&objp->maxlen))
+ bool_t res;
+
+ /*
+ * Save the passed in maxlen value and buf pointer. We might
+ * need them later.
+ */
+ uint_t maxlen_save = objp->maxlen;
+ void *buf_save = objp->buf;
+
+ if (!xdr_u_int(xdrs, &objp->maxlen))
return (FALSE);
- return (xdr_bytes(xdrs, (char **)&(objp->buf),
- (uint_t *)&(objp->len), objp->maxlen));
+
+ /*
+ * We need to free maxlen, not len, so do it explicitly now.
+ */
+ if (xdrs->x_op == XDR_FREE)
+ return (xdr_bytes(xdrs, &objp->buf, &objp->maxlen,
+ objp->maxlen));
+
+ /*
+ * If we're decoding and the caller has already allocated a
+ * buffer restore the maxlen value since the decoded value
+ * doesn't apply to the caller's buffer. xdr_bytes() will
+ * return an error if the buffer isn't big enough.
+ */
+ if (xdrs->x_op == XDR_DECODE && objp->buf != NULL)
+ objp->maxlen = maxlen_save;
+
+ res = xdr_bytes(xdrs, &objp->buf, &objp->len, objp->maxlen);
+
+ /*
+ * If we are decoding and the buffer was allocated in the
+ * xdr_bytes() function we need to set maxlen properly to
+ * follow the netbuf semantics.
+ */
+ if (xdrs->x_op == XDR_DECODE && objp->buf != buf_save)
+ objp->maxlen = objp->len;
+
+ return (res);
}
diff --git a/usr/src/uts/common/avs/ns/rdc/rdc_prot.x b/usr/src/uts/common/avs/ns/rdc/rdc_prot.x
index 3bd8bc877b..cf9055c186 100644
--- a/usr/src/uts/common/avs/ns/rdc/rdc_prot.x
+++ b/usr/src/uts/common/avs/ns/rdc/rdc_prot.x
@@ -40,7 +40,6 @@
% * <tiuser.h>. Instead we merely declare the XDR routine xdr_netbuf() here,
% * and implement it ourselves in rpc/rpcb_prot.c.
% */
-%#define xdr_netbuf rdc_xdr_netbuf
%#ifdef __cplusplus
%extern "C" bool_t xdr_netbuf(XDR *, struct netbuf *);
%
diff --git a/usr/src/uts/common/avs/ns/rdc/rdc_svc.c b/usr/src/uts/common/avs/ns/rdc/rdc_svc.c
index 109cad8bb2..ea1425055d 100644
--- a/usr/src/uts/common/avs/ns/rdc/rdc_svc.c
+++ b/usr/src/uts/common/avs/ns/rdc/rdc_svc.c
@@ -3077,25 +3077,3 @@ static rdcsrv_t rdc_srvtab[] = {
{ rdc_disptab6, sizeof (rdc_disptab6) / sizeof (*rdc_disptab6) },
{ rdc_disptab7, sizeof (rdc_disptab7) / sizeof (*rdc_disptab7) }
};
-
-bool_t
-rdc_xdr_netbuf(XDR *xdrs, struct netbuf *objp)
-{
- /*
- * If we're decoding and the caller has already allocated a buffer,
- * throw away maxlen, since it doesn't apply to the caller's
- * buffer. xdr_bytes will return an error if the buffer isn't big
- * enough.
- */
- if (xdrs->x_op == XDR_DECODE && objp->buf != NULL) {
- uint_t maxlen;
-
- if (!xdr_u_int(xdrs, &maxlen))
- return (FALSE);
- } else {
- if (!xdr_u_int(xdrs, (uint_t *)&objp->maxlen))
- return (FALSE);
- }
- return (xdr_bytes(xdrs, (char **)&(objp->buf),
- (uint_t *)&(objp->len), objp->maxlen));
-}
diff --git a/usr/src/uts/common/rpc/rpcb_prot.c b/usr/src/uts/common/rpc/rpcb_prot.c
index fcc1e5458f..90a711c193 100644
--- a/usr/src/uts/common/rpc/rpcb_prot.c
+++ b/usr/src/uts/common/rpc/rpcb_prot.c
@@ -37,13 +37,6 @@
* XDR routines for the rpcbinder version 3.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-#if !defined(lint) && defined(SCCSIDS)
-static char sccsid[] = "@(#)rpcb_prot.c 1.9 89/04/21 Copyr 1984 Sun Micro";
-#endif
-
-
#include <rpc/rpc.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
@@ -73,7 +66,7 @@ xdr_rpcb(XDR *xdrs, RPCB *objp)
bool_t
xdr_rpcb_rmtcallargs(XDR *xdrs, struct rpcb_rmtcallargs *objp)
{
- u_int lenposition, argposition, position;
+ uint_t lenposition, argposition, position;
if (!xdr_rpcprog(xdrs, &objp->prog))
return (FALSE);
@@ -86,15 +79,15 @@ xdr_rpcb_rmtcallargs(XDR *xdrs, struct rpcb_rmtcallargs *objp)
*/
lenposition = XDR_GETPOS(xdrs);
if (!xdr_u_int(xdrs, &(objp->arglen)))
- return (FALSE);
+ return (FALSE);
argposition = XDR_GETPOS(xdrs);
if (!(*(objp->xdr_args))(xdrs, objp->args_ptr))
- return (FALSE);
+ return (FALSE);
position = XDR_GETPOS(xdrs);
- objp->arglen = (u_int)position - (u_int)argposition;
+ objp->arglen = position - argposition;
XDR_SETPOS(xdrs, lenposition);
if (!xdr_u_int(xdrs, &(objp->arglen)))
- return (FALSE);
+ return (FALSE);
XDR_SETPOS(xdrs, position);
return (TRUE);
}
@@ -116,21 +109,43 @@ xdr_rpcb_rmtcallres(XDR *xdrs, struct rpcb_rmtcallres *objp)
bool_t
xdr_netbuf(XDR *xdrs, struct netbuf *objp)
{
+ bool_t res;
+
+ /*
+ * Save the passed in maxlen value and buf pointer. We might
+ * need them later.
+ */
+ uint_t maxlen_save = objp->maxlen;
+ void *buf_save = objp->buf;
+
+ if (!xdr_u_int(xdrs, &objp->maxlen))
+ return (FALSE);
+
+ /*
+ * We need to free maxlen, not len, so do it explicitly now.
+ */
+ if (xdrs->x_op == XDR_FREE)
+ return (xdr_bytes(xdrs, &objp->buf, &objp->maxlen,
+ objp->maxlen));
+
/*
- * If we're decoding and the caller has already allocated a buffer,
- * throw away maxlen, since it doesn't apply to the caller's
- * buffer. xdr_bytes will return an error if the buffer isn't big
- * enough.
+ * If we're decoding and the caller has already allocated a
+ * buffer restore the maxlen value since the decoded value
+ * doesn't apply to the caller's buffer. xdr_bytes() will
+ * return an error if the buffer isn't big enough.
*/
- if (xdrs->x_op == XDR_DECODE && objp->buf != NULL) {
- u_int maxlen;
-
- if (!xdr_u_int(xdrs, &maxlen))
- return (FALSE);
- } else {
- if (!xdr_u_int(xdrs, (u_int *)&objp->maxlen))
- return (FALSE);
- }
- return (xdr_bytes(xdrs, (char **)&(objp->buf),
- (u_int *)&(objp->len), objp->maxlen));
+ if (xdrs->x_op == XDR_DECODE && objp->buf != NULL)
+ objp->maxlen = maxlen_save;
+
+ res = xdr_bytes(xdrs, &objp->buf, &objp->len, objp->maxlen);
+
+ /*
+ * If we are decoding and the buffer was allocated in the
+ * xdr_bytes() function we need to set maxlen properly to
+ * follow the netbuf semantics.
+ */
+ if (xdrs->x_op == XDR_DECODE && objp->buf != buf_save)
+ objp->maxlen = objp->len;
+
+ return (res);
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-15 06:05:24 +0000