]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
node_device: Unlock obj in case of an error too
authorMarc Hartmayer <mhartmay@linux.vnet.ibm.com>
Mon, 22 May 2017 06:38:21 +0000 (08:38 +0200)
committerJohn Ferlan <jferlan@redhat.com>
Fri, 26 May 2017 14:44:05 +0000 (10:44 -0400)
Unlock @obj in case of an error too.

Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
src/node_device/node_device_driver.c

index f597340f184401e5aec4b0a9d040b290e4ce013b..dfce17ce7157b55d43bd734065b94d4b5797b7be 100644 (file)
@@ -284,7 +284,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
                         STREQ(cap->data.scsi_host.wwpn, wwpn)) {
 
                         if (virNodeDeviceLookupSCSIHostByWWNEnsureACL(conn, obj->def) < 0)
-                            goto out;
+                            goto error;
 
                         if ((dev = virGetNodeDevice(conn, obj->def->name))) {
                             if (VIR_STRDUP(dev->parent, obj->def->parent) < 0) {
@@ -306,6 +306,10 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn,
  out:
     nodeDeviceUnlock();
     return dev;
+
+ error:
+    virNodeDeviceObjUnlock(obj);
+    goto out;
 }