Changeset 57605 in vbox

Timestamp:

Sep 3, 2015 11:00:24 AM (9 years ago)

Author:

vboxsync

Message:

Additions/solaris: check the return value of mod_remove() before doing further cleanup

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/VBoxGuest-solaris.c (modified) (1 diff)
• solaris/DRM/vboxvideo_drm.c (modified) (1 diff)
• solaris/Mouse/vboxms.c (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -253 +253 @@
     RTLogDestroy(RTLogSetDefaultInstance(NULL));
 
-    mutex_destroy(&g_LdiMtx);
-
-    RTR0Term();
+    if (!rc)
+    {
+        mutex_destroy(&g_LdiMtx);
+        RTR0Term();
+    }
     return rc;
 }

trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c

@@ -156 +156 @@
     cmn_err(CE_NOTE, DEVICE_NAME ":_fini\n");
     int rc = mod_remove(&g_VBoxVideoSolarisModLinkage);
-    ddi_soft_state_fini(&g_pVBoxVideoSolarisState);
+    if (!rc)
+        ddi_soft_state_fini(&g_pVBoxVideoSolarisState);
     return rc;
 }

trunk/src/VBox/Additions/solaris/Mouse/vboxms.c

@@ -292 +292 @@
     LogRelFlow((DEVICE_NAME ":_fini\n"));
     rc = mod_remove(&g_vbmsSolModLinkage);
-    mutex_destroy(&g_OpenNodeState.InitMtx);
+    if (!rc)
+        mutex_destroy(&g_OpenNodeState.InitMtx);
 
     return rc;