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

Check for a NULL return from rpcclnt_buildheader- it can fail if

Browse Source 
the passed in auth_type is unacceptable to rpcauth_buildheader-
this avoids a null pointer panic. Clean up allocations if this
happens. This also quiets a gcc 4.2 complaint about ussing mheadend
without it being initialized.

Reviewed by:	alfred
This commit is contained in:
mjacob 2007-06-16 05:42:26 +00:00
parent 8386bd54e6
commit 2865ae0149
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/rpc/rpcclnt.c
View File

@ -1180,6 +1180,18 @@ rpcclnt_request(rpc, mrest, procnum, td, cred, reply)
m = rpcclnt_buildheader(rpc, procnum, mrest, mrest_len, &xid, &mheadend,
cred);
/*
* This can happen if the auth_type is neither UNIX or NULL
*/
if (m == NULL) {
#ifdef __OpenBSD__
pool_put(&rpctask_pool, task);
#else
FREE(task, M_RPC);
#endif
error = EPROTONOSUPPORT;
goto rpcmout;
}
/*
* For stream protocols, insert a Sun RPC Record Mark.
@ -1867,6 +1879,7 @@ rpcclnt_buildheader(rc, procid, mrest, mrest_len, xidp, mheadend, cred)
*tl++ = txdr_unsigned(procid);
if ((error = rpcauth_buildheader(rc->rc_auth, cred, &mb, &bpos))) {
m_freem(mreq);
RPCDEBUG("rpcauth_buildheader failed %d", error);
return NULL;
}