From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752572AbdIMPXb (ORCPT ); Wed, 13 Sep 2017 11:23:31 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36841 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752110AbdIMPX0 (ORCPT ); Wed, 13 Sep 2017 11:23:26 -0400 X-Google-Smtp-Source: AOwi7QBib9Y+xdJ7A0n/Jw9/P02WWeY/WHG/1s/sf+9iBUy4doachA3SvfVt1GPUbEx2YoLRQF2M2Q== From: Michal Hocko To: "Jorgen S. Hansen" Cc: Aditya Sarwade , Thomas Hellstrom , Petr Masik , Ben Hutchings , Sasha Levin , netdev@vger.kernel.org, Stable tree , LKML Subject: [PATCH stable-3.16 3/3] VSOCK: Detach QP check should filter out non matching QPs. Date: Wed, 13 Sep 2017 17:23:07 +0200 Message-Id: <20170913152307.20317-3-mhocko@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170913152307.20317-1-mhocko@kernel.org> References: <20170913151939.gf7n6rvvjtz47tz7@dhcp22.suse.cz> <20170913152307.20317-1-mhocko@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jorgen Hansen 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 Signed-off-by: Jorgen Hansen Signed-off-by: David S. Miller Signed-off-by: Michal Hocko --- 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