From patchwork Tue Jul 31 13:50:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Desrochers X-Patchwork-Id: 951609 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41fyVx00WFz9s3q; Tue, 31 Jul 2018 23:50:16 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fkV2P-0003XO-Qi; Tue, 31 Jul 2018 13:50:09 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fkV2N-0003Wo-M0 for kernel-team@lists.ubuntu.com; Tue, 31 Jul 2018 13:50:07 +0000 Received: from mail-qk0-f199.google.com ([209.85.220.199]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fkV2N-0002C1-AL for kernel-team@lists.ubuntu.com; Tue, 31 Jul 2018 13:50:07 +0000 Received: by mail-qk0-f199.google.com with SMTP id d25-v6so14111254qkj.9 for ; Tue, 31 Jul 2018 06:50:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=z8MEgsmSk8P6souIEnG3qB3r26vG1/SNqUWW/1NUsoo=; b=aX2wq/GBecboh+Ec4lKftPu8o5f0bsN9x7B6GpjOtt2Yf2kthk69QJk2IHzruvFRQq 1E1Sqojl3e/0Ptb+LnlxUpjZf/r66dHOwBOB3lSsbApge6XAhpKKMFe2dzw51HoFjT9z PYNpuSaDQ75dZueDy6ULL5dgELRdc5vr5w4kirGAKVak10mRkS5W4IoTKNX3RoGaksQE HRa3Ll4/5wuZ/D+sYZiNmVEhWb3f685lr/uh0RMt67j/tBrMY7V9EaNA41vVHXRJBaa2 hcK14/NgvByikOw+xlqPo/b3KXGxEryRU9aqK5tUPGreVCT4DkiNyOSHrIGv9+HkZlFj rDnQ== X-Gm-Message-State: AOUpUlG9qE01+fdmND1SIj2rMYRjHd6Mh0jlUZRAb/cvynwhhCRvLtsg iE4kySosVGcF91NWj8USgmVhgKUD07qQSmDl9bn5fyQLGAX7GLmCU1BU0bD96zbDAZtSnahMoqk ri4b4lmVfl/cZas8iMFPctTcY5US5K9McISD/OOEhAg== X-Received: by 2002:a37:c91b:: with SMTP id q27-v6mr20289952qki.397.1533045006248; Tue, 31 Jul 2018 06:50:06 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcCYzGhf3/VoMZBLoVvA+Vjeg29k5FWJqYewzpONMnP2MZds5CBFh3cTqlATXuI0W+51YjFCQ== X-Received: by 2002:a37:c91b:: with SMTP id q27-v6mr20289935qki.397.1533045006052; Tue, 31 Jul 2018 06:50:06 -0700 (PDT) Received: from thinkpad.in.azkaban.com (modemcable048.146-83-70.mc.videotron.ca. [70.83.146.48]) by smtp.gmail.com with ESMTPSA id h195-v6sm9095468qke.58.2018.07.31.06.50.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 06:50:05 -0700 (PDT) From: Eric Desrochers To: kernel-team@lists.ubuntu.com Subject: [SRU][Trusty][PATCH 3/3] VSOCK: Detach QP check should filter out non matching QPs. Date: Tue, 31 Jul 2018 09:50:00 -0400 Message-Id: <20180731135000.6114-4-eric.desrochers@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180731135000.6114-1-eric.desrochers@canonical.com> References: <20180731135000.6114-1-eric.desrochers@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1780470 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 (cherry picked from 8ab18d71de8b07d2c4d6f984b718418c09ea45c5) Signed-off-by: Eric Desrochers --- net/vmw_vsock/vmci_transport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 0d1fa05cc8ed..e0436a962789 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