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

Tighten up the error-handling in nlm_get_rpc. While I'm here, fix a

Browse Source 
couple of spelling mistakes in comments.
This commit is contained in:
Doug Rabson 2008-04-16 09:09:50 +00:00
parent abe458f391
commit 92c4ddb268
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/nlm/nlm_prot_impl.c
View File

@ -144,7 +144,7 @@ static CLIENT *nlm_lockd;
*/
/*
* A pending asynchronous lock request, stored on the nc_pending list
* A pending asynchronous lock request, stored on the nh_pending list
* of the NLM host.
*/
struct nlm_async_lock {
@ -323,6 +323,10 @@ nlm_get_rpc(struct sockaddr *sa, rpcprog_t prog, rpcvers_t vers)
*/
struct netbuf *a;
a = __rpc_uaddr2taddr_af(ss.ss_family, uaddr);
if (!a) {
CLNT_DESTROY(rpcb);
return (NULL);
}
memcpy(&ss, a->buf, a->len);
free(a->buf, M_RPC);
free(a, M_RPC);
@ -337,7 +341,6 @@ nlm_get_rpc(struct sockaddr *sa, rpcprog_t prog, rpcvers_t vers)
rpcvers = PMAPVERS;
CLNT_CONTROL(rpcb, CLSET_VERS, &rpcvers);
mapping.pm_prog = parms.r_prog;
mapping.pm_vers = parms.r_vers;
mapping.pm_prot = IPPROTO_UDP;
@ -366,6 +369,7 @@ nlm_get_rpc(struct sockaddr *sa, rpcprog_t prog, rpcvers_t vers)
if (stat != RPC_SUCCESS) {
printf("NLM: failed to contact remote rpcbind, stat = %d\n",
(int) stat);
CLNT_DESTROY(rpcb);
return (NULL);
}
@ -399,7 +403,7 @@ nlm_lock_callback(void *arg, int pending)
* Send the results back to the host.
*
* Note: there is a possible race here with nlm_host_notify
* destroying teh RPC client. To avoid problems, the first
* destroying the RPC client. To avoid problems, the first
* thing nlm_host_notify does is to cancel pending async lock
* requests.
*/