Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1731683

[PATCH stable-3.16 3/3] VSOCK: Detach QP check should filter out non matching QPs.

Show all headers | View raw

From: Jorgen Hansen <jhansen@vmware.com>

commit 8ab18d71de8b07d2c4d6f984b718418c09ea45c5 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: George Zhang <georgezhang@vmware.com>
Signed-off-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
 net/vmw_vsock/vmci_transport.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 314312272e08..c69c990ec4a2 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -844,7 +844,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
@@ -2158,7 +2158,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);
-- 
2.14.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

scheduling while atomic from vmci_transport_recv_stream_cb in 3.16  kernels Michal Hocko <mhocko@kernel.org> - 2017-09-12 11:10 +0200
  Re: scheduling while atomic from vmci_transport_recv_stream_cb in  3.16 kernels "Jorgen S. Hansen" <jhansen@vmware.com> - 2017-09-13 17:10 +0200
    Re: scheduling while atomic from vmci_transport_recv_stream_cb in  3.16 kernels Michal Hocko <mhocko@kernel.org> - 2017-09-13 17:20 +0200
      [PATCH stable-3.16 1/3] VSOCK: sock_put wasn't safe to call in interrupt context Michal Hocko <mhocko@kernel.org> - 2017-09-13 17:30 +0200
        [PATCH stable-3.16 2/3] VSOCK: Fix lockdep issue. Michal Hocko <mhocko@kernel.org> - 2017-09-13 17:30 +0200
        [PATCH stable-3.16 3/3] VSOCK: Detach QP check should filter out non matching QPs. Michal Hocko <mhocko@kernel.org> - 2017-09-13 17:30 +0200
      Re: scheduling while atomic from vmci_transport_recv_stream_cb in  3.16 kernels "Jorgen S. Hansen" <jhansen@vmware.com> - 2017-09-13 21:00 +0200
        Re: scheduling while atomic from vmci_transport_recv_stream_cb in  3.16 kernels Michal Hocko <mhocko@kernel.org> - 2017-09-14 11:10 +0200
          Re: scheduling while atomic from vmci_transport_recv_stream_cb in  3.16 kernels Ben Hutchings <ben@decadent.org.uk> - 2017-09-15 19:20 +0200
            Re: scheduling while atomic from vmci_transport_recv_stream_cb in  3.16 kernels Michal Hocko <mhocko@kernel.org> - 2017-09-18 08:20 +0200

csiph-web