From: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Date: Mon, 22 May 2017 06:38:21 +0000 (+0200)
Subject: node_device: Unlock obj in case of an error too
X-Git-Tag: v3.4.0-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9b98ecf4ea60d90e978b19708e99ef3d130a660;p=thirdparty%2Flibvirt.git

node_device: Unlock obj in case of an error too

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>
---

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index f597340f18..dfce17ce71 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -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;
 }