[libvirt] [PATCH 1/4] nodedev: Add check for NULL obj before call Unlock

John Ferlan jferlan at redhat.com
Wed Jun 28 11:37:35 UTC 2017


Commit id '95ea171b' was a bit too aggressive in removing the if (obj)
check since cleanup is reachable after Unlock and obj = NULL.

Signed-off-by: John Ferlan <jferlan at redhat.com>
---
 src/node_device/node_device_driver.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index bc5c0e5..5bf202e 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -650,7 +650,8 @@ nodeDeviceDestroy(virNodeDevicePtr dev)
 
  cleanup:
     nodeDeviceUnlock();
-    virNodeDeviceObjUnlock(obj);
+    if (obj)
+        virNodeDeviceObjUnlock(obj);
     VIR_FREE(wwnn);
     VIR_FREE(wwpn);
     return ret;
-- 
2.9.4




More information about the libvir-list mailing list