Commit 8d5ed79f authored by Jorgen Hansen's avatar Jorgen Hansen Committed by Greg Kroah-Hartman

VSOCK: Detach QP check should filter out non matching QPs.

commit 8ab18d71 upstream.

The check in vmci_transport_peer_detach_cb should only allow a
detach when the qp handle of the transport matches the one in
the detach message.

Testing: Before this change, a detach from a peer on a different
socket would cause an active stream socket to register a detach.
Reviewed-by: default avatarGeorge Zhang <georgezhang@vmware.com>
Signed-off-by: default avatarJorgen Hansen <jhansen@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8034166
...@@ -842,7 +842,7 @@ static void vmci_transport_peer_detach_cb(u32 sub_id, ...@@ -842,7 +842,7 @@ static void vmci_transport_peer_detach_cb(u32 sub_id,
* qp_handle. * qp_handle.
*/ */
if (vmci_handle_is_invalid(e_payload->handle) || if (vmci_handle_is_invalid(e_payload->handle) ||
vmci_handle_is_equal(trans->qp_handle, e_payload->handle)) !vmci_handle_is_equal(trans->qp_handle, e_payload->handle))
return; return;
/* We don't ask for delayed CBs when we subscribe to this event (we /* We don't ask for delayed CBs when we subscribe to this event (we
...@@ -2154,7 +2154,7 @@ module_exit(vmci_transport_exit); ...@@ -2154,7 +2154,7 @@ module_exit(vmci_transport_exit);
MODULE_AUTHOR("VMware, Inc."); MODULE_AUTHOR("VMware, Inc.");
MODULE_DESCRIPTION("VMCI transport for Virtual Sockets"); MODULE_DESCRIPTION("VMCI transport for Virtual Sockets");
MODULE_VERSION("1.0.2.0-k"); MODULE_VERSION("1.0.3.0-k");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_ALIAS("vmware_vsock"); MODULE_ALIAS("vmware_vsock");
MODULE_ALIAS_NETPROTO(PF_VSOCK); MODULE_ALIAS_NETPROTO(PF_VSOCK);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment