d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some return-value brain-damage in forward_register(). This

Browse Source 
function has a return type of u_int32_t, into which it was somehow
supposed to encode:
 *  A valid 32-bit XID (which could be any value including 0).
 *  0, meaning a duplicate request.
 *  -1, meaning a malloc failed (!);
We now ensure that all XIDs are non-zero, and pass the XID out via
a pointer argument.

In forward_find() and free_slot_by_xid(), remove an unnecessary
and confusing test for a negative result from an unsigned modulo
operation, but add an unnecessary cast to highlight why.
This commit is contained in:
Ian Dowse 2001-06-23 21:54:47 +00:00
parent eca1c24e5a
commit 98f36a359d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=78681
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
usr.sbin/rpcbind/rpcb_svc_com.c
View File

@ -98,8 +98,8 @@ static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *));
static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *));
static int find_rmtcallfd_by_netid __P((char *));
static SVCXPRT *find_rmtcallxprt_by_fd __P((int));
static u_int32_t forward_register __P((u_int32_t, struct netbuf *, int, char *,
rpcproc_t, rpcvers_t));
static int forward_register __P((u_int32_t, struct netbuf *, int, char *,
rpcproc_t, rpcvers_t, u_int32_t *));
static struct finfo *forward_find __P((u_int32_t));
static int free_slot_by_xid __P((u_int32_t));
static int free_slot_by_index __P((int));
@ -765,9 +765,13 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
goto error;
}
xidp = __rpcb_get_dg_xidp(transp);
call_msg.rm_xid = forward_register(*xidp,
caller, fd, m_uaddr, reply_type, versnum);
if (call_msg.rm_xid == 0) {
switch (forward_register(*xidp, caller, fd, m_uaddr, reply_type,
versnum, &call_msg.rm_xid)) {
case 1:
/* Success; forward_register() will free m_uaddr for us. */
m_uaddr = NULL;
break;
case 0:
/*
* A duplicate request for the slow server. Let's not
* beat on it any more.
@ -777,7 +781,7 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
"rpcbproc_callit_com: duplicate request\n");
free((void *) m_uaddr);
goto error;
} else if (call_msg.rm_xid == -1) {
case -1:
/* forward_register failed. Perhaps no memory. */
if (debugging)
fprintf(stderr,
@ -919,12 +923,13 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
/*
* Makes an entry into the FIFO for the given request.
* If duplicate request, returns a 0, else returns the xid of its call.
* Returns 1 on success, 0 if this is a duplicate request, or -1 on error.
* *callxidp is set to the xid of the call.
*/
static u_int32_t
static int
forward_register(u_int32_t caller_xid, struct netbuf *caller_addr,
int forward_fd, char *uaddr, rpcproc_t reply_type,
rpcvers_t versnum)
rpcvers_t versnum, u_int32_t *callxidp)
{
int i;
int j = 0;
@ -989,8 +994,12 @@ forward_register(u_int32_t caller_xid, struct netbuf *caller_addr,
*/
FINFO[j].uaddr = uaddr;
lastxid = lastxid + NFORWARD;
/* Don't allow a zero xid below. */
if ((u_int32_t)(lastxid + NFORWARD) <= NFORWARD)
lastxid = NFORWARD;
FINFO[j].forward_xid = lastxid + j; /* encode slot */
return (FINFO[j].forward_xid); /* forward on this xid */
*callxidp = FINFO[j].forward_xid; /* forward on this xid */
return (1);
}
static struct finfo *
@ -998,9 +1007,7 @@ forward_find(u_int32_t reply_xid)
{
int i;
i = reply_xid % NFORWARD;
if (i < 0)
i += NFORWARD;
i = reply_xid % (u_int32_t)NFORWARD;
if ((FINFO[i].flag & FINFO_ACTIVE) &&
(FINFO[i].forward_xid == reply_xid)) {
return (&FINFO[i]);
@ -1013,9 +1020,7 @@ free_slot_by_xid(u_int32_t xid)
{
int entry;
entry = xid % NFORWARD;
if (entry < 0)
entry += NFORWARD;
entry = xid % (u_int32_t)NFORWARD;
return (free_slot_by_index(entry));
}