diff options
| author | Joshua M. Clulow <jmc@joyent.com> | 2013-10-31 07:19:33 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2013-11-05 21:36:18 -0800 |
| commit | c6d054cbc999e5c8b9ad1aa01dbb4800b84f06bd (patch) | |
| tree | cc43a7aa974e28a715bb414c8cd75a689b20b471 /usr/src | |
| parent | 54a20ab41aadcb81c53e72fc65886e964e9add59 (diff) | |
| download | illumos-gate-c6d054cbc999e5c8b9ad1aa01dbb4800b84f06bd.tar.gz | |
4290 dlmgmtd is careless with avl_find
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@nexenta.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/dlmgmtd/dlmgmt_util.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_util.c b/usr/src/cmd/dlmgmtd/dlmgmt_util.c index 004c8f257b..afcfbed37b 100644 --- a/usr/src/cmd/dlmgmtd/dlmgmt_util.c +++ b/usr/src/cmd/dlmgmtd/dlmgmt_util.c @@ -415,9 +415,10 @@ link_by_id(datalink_id_t linkid, zoneid_t zoneid) dlmgmt_link_t link, *linkp; link.ll_linkid = linkid; - linkp = avl_find(&dlmgmt_id_avl, &link, NULL); + if ((linkp = avl_find(&dlmgmt_id_avl, &link, NULL)) == NULL) + return (NULL); if (zoneid != GLOBAL_ZONEID && linkp->ll_zoneid != zoneid) - linkp = NULL; + return (NULL); return (linkp); } |