diff options
| author | Joshua M. Clulow <jmc@joyent.com> | 2013-10-31 07:19:33 -0700 |
|---|---|---|
| committer | Joshua M. Clulow <jmc@joyent.com> | 2013-10-31 14:19:34 +0000 |
| commit | d38e3bab7d00735129a23daad5ed47ceec4fca3b (patch) | |
| tree | b98e6e806de30bb10a823286f00ca140b1c75d74 /usr/src/cmd/dlmgmtd | |
| parent | 14b6a3d4c4c56f58a01a118cae41dc101d48eff7 (diff) | |
| download | illumos-joyent-d38e3bab7d00735129a23daad5ed47ceec4fca3b.tar.gz | |
OS-2603 dlmgmtd is careless with avl_find
Diffstat (limited to 'usr/src/cmd/dlmgmtd')
| -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 a2d9800b7b..b8d02d6f5d 100644 --- a/usr/src/cmd/dlmgmtd/dlmgmt_util.c +++ b/usr/src/cmd/dlmgmtd/dlmgmt_util.c @@ -409,9 +409,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); } |