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=1792758055; b=5pQzg/NWQF+qwj2Cy5N5137tBjNhP2E63SyPlYzK8J26xD9f97w165jwRJUT1HwUBsWn R+bx1I5ss5aJuYi5sISz5VgF43DI2YFBulmGDAEXMmaxdtRwzrCQQp3gj+i4ycKgUkdYQ fZK/0+wkUMOazsiROouIY5443U68FCoXOH+g3cACnK2q+rLK0B0V+5ch6kAIpM4dbb2jE +bvfsvmvRz3KNZDHcm4IEt1eUAUH+Htqq9ng6BfFp+YQj8MyJTLdROXwy14s1lYElspmo iKsenzMKdL0zZZVWI2bOMEo2l6+2D64JkbqG0hD2PTcRJbD25NGQTckaw6ormzWxfFg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792758055; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=YXAgGXEXpUVpl4APeRrfzJlM7bkQM/8J4d8iBLQc/N8=; b=ODgCV09xlMsSigIiD9K4xck22+tXRAhFgQo7I3G8Thi8jOKhZnv4ty7Gi8Px1Bb4XTpN FmNorbJ/OseOUDLERKPTk/BewhfVGQ7MN9KSEZP5OMmeLZjgBHxGRzXAZwpbxto3jKgxO 9ngt0KdW+P2L0do7wMQHe2kFqNZj+iZhTbfnjPP1ExVF34P7whorPiB4DB+xW85thRlpv 21zsjHXSXwUqM4vOtNGrDqW/ZcfPoTNkBy64Now2M0++MuaEMhQD82sdhL4xwN53/51Ev NgCKIWESsOTssKE2ZRc8aWwZRuelh2dhHKpsZHO00Imznqx9llLoChf9spaeiVRp09Q== 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=C1Ixvb2u; 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 72FA4606A31E for ; Fri, 23 Oct 2026 12:20:55 +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=C1Ixvb2u Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB02D1F01825; Fri, 23 Oct 2026 12:20:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792758055; bh=YXAgGXEXpUVpl4APeRrfzJlM7bkQM/8J4d8iBLQc/N8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=C1Ixvb2u9OGZ9zcqipA80KNFZw06YrDyeyC46QjE+aXV4SAcKgoiumbkQofNPtncR fSCncOl/RGyXc0bD7GOiHV5Y8T0q4Lt0/H5LZccCzsc5pCCy4pQxMnF2UtJLGzQ26h YvfQevwAijRV2lo5NwfuxD7IQk7XdBUjuSM3VuEQt5TUd8j3B7kgNJCvP6Qkn559MX arg415zsMVmr0+sgM5xmEYUCn7OpsecGV3jxsnejBeoKURrpCB5QgjkPtleHe8uw51 1XUDpoPJYprGuJVItCuvFjUPsk//VKXg9OUmRsPcJSmG6G2fV9Cvhe4WaCOy+cvEVm IvC9pl9az7l3A== 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 5.10.y] vsock/vmci: validate packet source for connected sockets Date: Fri, 23 Oct 2026 08:20:52 -0400 Message-ID: <20261023120701.2344198-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026102123-unusable-siamese-c737@gregkh> References: <2026102123-unusable-siamese-c737@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 combined vmci_check_transport() and vsock_addr_equals_addr() checks. ] Signed-off-by: Sasha Levin --- net/vmw_vsock/vmci_transport.c | 36 ++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 4085163bb92dd..468d4b8b66db7 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,30 @@ 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 && + (!vmci_check_transport(vsk) || + !vsock_addr_equals_addr(&vsk->remote_addr, &src))) { + 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 +907,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 +916,13 @@ 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 && + (!vmci_check_transport(vsock_sk(sk)) || + !vsock_addr_equals_addr(&vsock_sk(sk)->remote_addr, &src))) { + 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 +952,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