From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792712037; b=G2hLUIAd7SjAarQ8lPl5oGSGWeTWtHxlvckIANWWVwTrS+6Nj3fXx/yIrWCtUOrKrKSc zCpK1TdWDXupGbm762IcDWgviDKzXC5L7TwNYfHN6VSv2oDXzu90uecUkcOrRhJW4V1T4 hotCqGlvsdQikMVo9osQT+eHHtobDvZ+cmh/Nc77xsKVXIdGX+o//Zx9H3wG3l1tdDhsu Z2mofwNFLvyS/p3UzXl1peaWolNrU64yMyu0/nM4NOtbr8nHeCnJtqUpvzADSBEq0/WlE KUAAoihoN/BC1QXZEgkp4Jt0nJdLGik06dPdAw0UduUctlt4sAYqwLUMg+gDVKP8zJw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792712037; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=sM8fvtA5QbEVyTKxD0tw+WukKnEQiKYBZUIqpyeIIps=; b=ns5srxfqh4tSL8cBvNJyzPhuPsHgZj7/x7lT49VZmy4ifVr6s1K4zvuh58fOPlNywTtq fN6Mxq619h139fh2eY+iEdbl9KtmuEkAcvrs9VqK9Sw530a1GkjzlSYfEMt8PZVc0DKXI 5L2aq+L6EUu5wBWOl/XkRQz/IlXeAlBDpR7oJJkgSQ4+39Sa7Hpa1bMF5LjtsLLgIJSPv 1/9c4PA8fhKtNWv93xM498Ev5lGUmy23M8LxY29CkOsYq6dznK+hntu3xaZNRt0dLBC3L a0IK8SGpbi2hOZxTdWHOgE70cEBNfLDUNQRgufnv3dfe7KSzic6YSQGxBcTl65YHRhQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=mhsVyafO; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 058FF606A31A for ; Thu, 22 Oct 2026 23:33:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=mhsVyafO Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B6CC1F01825; Thu, 22 Oct 2026 23:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792712036; bh=sM8fvtA5QbEVyTKxD0tw+WukKnEQiKYBZUIqpyeIIps=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mhsVyafOt5FbF24VV/iWE/L8RUalT90eMlE8EVvodNsl4css0N5cMCoMk2vGWZd+r UKGE/+8W1F2g/pZgj55kui+KWhiFxD7BdMTnE5sSalIvHzrlUk/hMgLeOS9WDH12JI BHCPb8j3nnfWFs4ysEaPDy8xCxb0J8WtnUrAz8VajtTwKUkbjHisNQiE25DTx39LR1 X8/EtDaAMoRDxrVjInHCJ00ygkNiNPsvqpbq3McWGAtwkIOsEZNQILL79+dnb4aDqV eJa5kfhHbs45NJeJ8mEhuYplOyEDiObackwwItXGvL7j9n8OJrp5VLMJdtyc93sE8x hlts5pXIJ25YQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Daehyeon Ko <4ncienth@gmail.com>, Sashiko , Stefano Garzarella , Paolo Abeni , Vishnu Dasa , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] vsock/vmci: validate packet source for connected sockets Date: Thu, 22 Oct 2026 19:33:54 -0400 Message-ID: <20261022233059.2161194-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026102122-hamburger-bats-908a@gregkh> References: <2026102122-hamburger-bats-908a@gregkh> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Daehyeon Ko <4ncienth@gmail.com> [ Upstream commit ad9a7da3fa39c2d616ec0dd3cf6e30531d032fe7 ] vmci_transport_recv_stream_cb() looks up sockets first by the full source and destination tuple, then by destination only in the bound table. The fallback can select a non-listening socket without checking whether the packet came from its stored peer. This was reproduced with two VMCI contexts. A RST from the context not stored in a TCP_SYN_SENT socket reset that socket after it was selected by the destination-only lookup. VMCI can process notification packets in bottom-half context when the socket is not owned by user context, or defer packets to a workqueue. Use vsock_check_source() after taking the socket lock in the bottom-half path, and recheck after lock_sock() in the workqueue path. Listening sockets continue to accept packets from any source. Reply with a RST addressed from the received packet before dropping a source that fails validation. This preserves the existing reset behavior for bound non-listening and concurrently closed sockets without directing the reset to a connected socket's stored peer. Fixes: d021c344051a ("VSOCK: Introduce VM Sockets") Reported-by: Sashiko Closes: https://lore.kernel.org/netdev/20260814121255.6B5001F000E9@smtp.kernel.org/ Cc: stable@vger.kernel.org Suggested-by: Stefano Garzarella Suggested-by: Paolo Abeni Signed-off-by: Daehyeon Ko <4ncienth@gmail.com> Reviewed-by: Vishnu Dasa Link: https://patch.msgid.link/20260826003929.966160-3-4ncienth@gmail.com Signed-off-by: Jakub Kicinski [ sashal: Replaced unavailable vsock_check_source() calls with equivalent inline conditions. ] Signed-off-by: Sasha Levin --- net/vmw_vsock/vmci_transport.c | 40 +++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index ff3602d45de92..44203c759a31c 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -676,11 +676,13 @@ static int vmci_transport_recv_stream_cb(void *data, struct vmci_datagram *dg) struct vmci_transport_packet *pkt; struct vsock_sock *vsk; bool bh_process_pkt; + bool drop_pkt; int err; sk = NULL; err = VMCI_SUCCESS; bh_process_pkt = false; + drop_pkt = false; /* Ignore incoming packets from contexts without sockets, or resources * that aren't vsock implementations. @@ -757,17 +759,32 @@ static int vmci_transport_recv_stream_cb(void *data, struct vmci_datagram *dg) bh_lock_sock(sk); if (!sock_owned_by_user(sk)) { - /* The local context ID may be out of date, update it. */ - vsk->local_addr.svm_cid = dst.svm_cid; + if (sk->sk_state != TCP_LISTEN && + (vsk->transport != &vmci_transport || + src.svm_port != vsk->remote_addr.svm_port || + (src.svm_cid != vsk->remote_addr.svm_cid && + vmci_transport.get_local_cid() != VMADDR_CID_LOCAL))) { + drop_pkt = true; + err = VMCI_ERROR_NO_ACCESS; + } else { + /* The local context ID may be out of date, update it. */ + vsk->local_addr.svm_cid = dst.svm_cid; - if (sk->sk_state == TCP_ESTABLISHED) - vmci_trans(vsk)->notify_ops->handle_notify_pkt( - sk, pkt, true, &dst, &src, - &bh_process_pkt); + if (sk->sk_state == TCP_ESTABLISHED) + vmci_trans(vsk)->notify_ops->handle_notify_pkt(sk, pkt, true, + &dst, &src, + &bh_process_pkt); + } } bh_unlock_sock(sk); + if (drop_pkt) { + if (vmci_transport_send_reset_bh(&dst, &src, pkt) < 0) + pr_err("unable to send reset\n"); + goto out; + } + if (!bh_process_pkt) { struct vmci_transport_recv_pkt_info *recv_pkt_info; @@ -892,6 +909,7 @@ static void vmci_transport_recv_pkt_work(struct work_struct *work) { struct vmci_transport_recv_pkt_info *recv_pkt_info; struct vmci_transport_packet *pkt; + struct sockaddr_vm src; struct sock *sk; recv_pkt_info = @@ -900,6 +918,15 @@ static void vmci_transport_recv_pkt_work(struct work_struct *work) pkt = &recv_pkt_info->pkt; lock_sock(sk); + vsock_addr_init(&src, pkt->dg.src.context, pkt->src_port); + if (sk->sk_state != TCP_LISTEN && + (vsock_sk(sk)->transport != &vmci_transport || + src.svm_port != vsock_sk(sk)->remote_addr.svm_port || + (src.svm_cid != vsock_sk(sk)->remote_addr.svm_cid && + vmci_transport.get_local_cid() != VMADDR_CID_LOCAL))) { + vmci_transport_reply_reset(pkt); + goto out; + } /* The local context ID may be out of date. */ vsock_sk(sk)->local_addr.svm_cid = pkt->dg.dst.context; @@ -929,6 +956,7 @@ static void vmci_transport_recv_pkt_work(struct work_struct *work) break; } +out: release_sock(sk); kfree(recv_pkt_info); /* Release reference obtained in the stream callback when we fetched -- 2.53.0