From: VMware, Inc <>
Date: Tue, 24 Aug 2010 18:13:31 +0000 (-0700)
Subject: VMCIDoorbell_Destroy: Assert when destroying non existent handle.
X-Git-Tag: 2010.08.24-292196~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ac0fb0661ac71e632e16f3a628c19f7c5a3f6ad;p=thirdparty%2Fopen-vm-tools.git

VMCIDoorbell_Destroy: Assert when destroying non existent handle.

The VMCINotificationUnregister function in the vmci guest driver
was asserting FALSE when destroying a doorbell handle that does not
exist in the internal hash. This was causing the guest kernel to panic
when trying to destroy a handle that was already destroyed.

We should probably just return VMCI_ERROR_NOT_FOUND here instead of
asserting.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/modules/linux/vmci/vmciNotifications.c b/open-vm-tools/modules/linux/vmci/vmciNotifications.c
index 740fcda22..90f9b7990 100644
--- a/open-vm-tools/modules/linux/vmci/vmciNotifications.c
+++ b/open-vm-tools/modules/linux/vmci/vmciNotifications.c
@@ -831,7 +831,6 @@ VMCINotificationUnregister(VMCIHandle handle, // IN
 
    entry = VMCINotifyHashRemoveEntry(handle, doorbell);
    if (!entry) {
-      ASSERT(FALSE);
       return VMCI_ERROR_NOT_FOUND;
    }