diff options
| author | dfr <dfr@FreeBSD.org> | 2008-04-16 09:09:50 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 2008-04-16 09:09:50 +0000 |
| commit | 0e16b52aecb9efb40df3384931b2f3afe0d44466 (patch) | |
| tree | e8fe0bdfc6e6343d8119e19b8deb0522ccad8933 /sys/nlm | |
| parent | 4f0c181fb3b882fa837e9f5f365eea88af9a5863 (diff) | |
| download | FreeBSD-src-0e16b52aecb9efb40df3384931b2f3afe0d44466.zip FreeBSD-src-0e16b52aecb9efb40df3384931b2f3afe0d44466.tar.gz | |
Tighten up the error-handling in nlm_get_rpc. While I'm here, fix a
couple of spelling mistakes in comments.
Diffstat (limited to 'sys/nlm')
| -rw-r--r-- | sys/nlm/nlm_prot_impl.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/nlm/nlm_prot_impl.c b/sys/nlm/nlm_prot_impl.c index 626fa02..d48b8a5 100644 --- a/sys/nlm/nlm_prot_impl.c +++ b/sys/nlm/nlm_prot_impl.c @@ -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 @@ again: */ 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 @@ again: 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 @@ again: 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. */ |
