VMCI: Doorbell create and destroy fixes
This change consists of two changes: 1) If vmci_doorbell_create is called when neither guest nor host personality as been initialized, vmci_get_context_id will return VMCI_INVALID_ID. In that case, we should fail the create call. 2) In doorbell destroy, we assume that vmci_guest_code_active() has the same return value on create and destroy. That may not be the case, so we may end up with the wrong refcount. Instead, destroy should check explicitly whether the doorbell is in the index table as an indicator of whether the guest code was active at create time. Reviewed-by: Adit Ranadive <aditr@vmware.com> Signed-off-by: Jorgen Hansen <jhansen@vmware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
a7a7aeefbc
Коммит
eb94cd68ab
|
@ -431,6 +431,12 @@ int vmci_doorbell_create(struct vmci_handle *handle,
|
|||
if (vmci_handle_is_invalid(*handle)) {
|
||||
u32 context_id = vmci_get_context_id();
|
||||
|
||||
if (context_id == VMCI_INVALID_ID) {
|
||||
pr_warn("Failed to get context ID\n");
|
||||
result = VMCI_ERROR_NO_RESOURCES;
|
||||
goto free_mem;
|
||||
}
|
||||
|
||||
/* Let resource code allocate a free ID for us */
|
||||
new_handle = vmci_make_handle(context_id, VMCI_INVALID_ID);
|
||||
} else {
|
||||
|
@ -525,7 +531,7 @@ int vmci_doorbell_destroy(struct vmci_handle handle)
|
|||
|
||||
entry = container_of(resource, struct dbell_entry, resource);
|
||||
|
||||
if (vmci_guest_code_active()) {
|
||||
if (!hlist_unhashed(&entry->node)) {
|
||||
int result;
|
||||
|
||||
dbell_index_table_remove(entry);
|
||||
|
|
|
@ -113,5 +113,5 @@ module_exit(vmci_drv_exit);
|
|||
|
||||
MODULE_AUTHOR("VMware, Inc.");
|
||||
MODULE_DESCRIPTION("VMware Virtual Machine Communication Interface.");
|
||||
MODULE_VERSION("1.1.4.0-k");
|
||||
MODULE_VERSION("1.1.5.0-k");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
Загрузка…
Ссылка в новой задаче