From c6d054cbc999e5c8b9ad1aa01dbb4800b84f06bd Mon Sep 17 00:00:00 2001 From: "Joshua M. Clulow" Date: Thu, 31 Oct 2013 07:19:33 -0700 Subject: 4290 dlmgmtd is careless with avl_find Reviewed by: Robert Mustacchi Approved by: Dan McDonald --- usr/src/cmd/dlmgmtd/dlmgmt_util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr/src') 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); } -- cgit v1.2.3