summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorgen Hansen <jhansen@vmware.com>2016-04-05 01:59:32 -0700
committerDavid S. Miller <davem@davemloft.net>2016-04-06 16:39:09 -0400
commit8ab18d71de8b07d2c4d6f984b718418c09ea45c5 (patch)
treeda4cda935f436aa8beeba79bd6d384084b61de9b
parent52f95bbfcf72126a9f90a386a974fcbe6c6cae46 (diff)
downloadop-kernel-dev-8ab18d71de8b07d2c4d6f984b718418c09ea45c5.zip
op-kernel-dev-8ab18d71de8b07d2c4d6f984b718418c09ea45c5.tar.gz
VSOCK: Detach QP check should filter out non matching QPs.
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: George Zhang <georgezhang@vmware.com> Signed-off-by: Jorgen Hansen <jhansen@vmware.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/vmw_vsock/vmci_transport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 0a369bb..662bdd2 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -842,7 +842,7 @@ static void vmci_transport_peer_detach_cb(u32 sub_id,
* qp_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;
/* We don't ask for delayed CBs when we subscribe to this event (we
@@ -2154,7 +2154,7 @@ module_exit(vmci_transport_exit);
MODULE_AUTHOR("VMware, Inc.");
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_ALIAS("vmware_vsock");
MODULE_ALIAS_NETPROTO(PF_VSOCK);
OpenPOWER on IntegriCloud