From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB759C3276E for ; Thu, 2 Jan 2020 22:33:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B360A20863 for ; Thu, 2 Jan 2020 22:33:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004414; bh=emWZ48uoZHrh2YRP885xUCauJ6Maa8BFd+LRiR0Z69g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0M+o8wg7MAjl0K/6Ji6qcra+27dLHxsc1tSyByIbDn+ejdLyfCrLGDhWS9ZR2QrMd E61G5GuE7ide06PvkswkjAxe5J4jf1I/JqVZu5nxdUgNTW/kwr1lIHyHGwJX+6QN2B 0iLli4gJUZ/yW3Eqw1sF8NVdT1zaVLOQb8q/NZAI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730416AbgABWdd (ORCPT ); Thu, 2 Jan 2020 17:33:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:41010 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728764AbgABWd3 (ORCPT ); Thu, 2 Jan 2020 17:33:29 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EF0A220863; Thu, 2 Jan 2020 22:33:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004409; bh=emWZ48uoZHrh2YRP885xUCauJ6Maa8BFd+LRiR0Z69g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AMwAE6xf9a3w+UCRHrtb73qM7D4cVyJEFtwkoyKeiblliUUItQQXHrbX/51ExKYBN iENXeDa+17Pa25J9obekMirJLCWUjhavwiFnQSYa9yjMUNcAjrWuDjqDSAgFsULxQ0 d9QmtKogIT4qpKr8JOnJ0hLT+b6BtAoIsVcPyjV4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefano Garzarella , "David S. Miller" Subject: [PATCH 4.9 167/171] vhost/vsock: accept only packets with the right dst_cid Date: Thu, 2 Jan 2020 23:08:18 +0100 Message-Id: <20200102220609.862791465@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.960200039@linuxfoundation.org> References: <20200102220546.960200039@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefano Garzarella [ Upstream commit 8a3cc29c316c17de590e3ff8b59f3d6cbfd37b0a ] When we receive a new packet from the guest, we check if the src_cid is correct, but we forgot to check the dst_cid. The host should accept only packets where dst_cid is equal to the host CID. Signed-off-by: Stefano Garzarella Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/vhost/vsock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -399,7 +399,9 @@ static void vhost_vsock_handle_tx_kick(s len = pkt->len; /* Only accept correctly addressed packets */ - if (le64_to_cpu(pkt->hdr.src_cid) == vsock->guest_cid) + if (le64_to_cpu(pkt->hdr.src_cid) == vsock->guest_cid && + le64_to_cpu(pkt->hdr.dst_cid) == + vhost_transport_get_local_cid()) virtio_transport_recv_pkt(pkt); else virtio_transport_free_pkt(pkt);