From nobody Fri Dec 19 20:58:11 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C6C5201256 for ; Wed, 8 Jan 2025 18:06:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736359592; cv=none; b=gwFdyg8xRW+SfbIXRMEUCkIK+HIfud42PaAzS4maVZovc0H40fH8tL05Cu4pUB1fSkTGDWX8O0Gjuc2VdKT0dIVfbHgsuRcvm5I3lDF/qvTXhwQWdOc9pQot4Ck10Ybp9WWAA5r0NoKrdSd2FqMmDLEdW607NEUGrYJo4YtswxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736359592; c=relaxed/simple; bh=XhT2B/XMcI2q+vQQF0C3xrDtTRflQwJMsW4aCd7eL48=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FhWnEsJZEWP0+tFXSA5+cPcMFRCjLj0RbwQWA07B2iWPaDQoijQml6V8+n37nG5C+oeRa/9p0kIcslUS2ohlkVMYRP4NHG1hjbD+BS6Z2yLnOuzCcmFYHgKnF61Lt/hVLcsPqLCTU6LUjEMxDGl0pehL5O8njE6ZQs5hCYMw2nU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=bhVvhhs+; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bhVvhhs+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736359589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P81z0YmLvdT8m64Ix0hrS5vpO81KiskzyN+gGNFCQNI=; b=bhVvhhs+7e96qbdECTWih7eDNmLwghMIlzr7NEyjBr9NJ9QbMDmqDrR2FUNRU36KWls0k1 xrZUgf69HbVBejufFIsRmwV136nnma14wTNGIP67b8YZhdaxsRJHInkSW3W6JIc3OhiFlQ 9BPLgi1dv9bHc3pwxNCX9XxjNiRmW6U= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-GmpOr8UANzqTl-ZP7blQsg-1; Wed, 08 Jan 2025 13:06:27 -0500 X-MC-Unique: GmpOr8UANzqTl-ZP7blQsg-1 X-Mimecast-MFC-AGG-ID: GmpOr8UANzqTl-ZP7blQsg Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-385ed79291eso578490f8f.0 for ; Wed, 08 Jan 2025 10:06:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736359586; x=1736964386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P81z0YmLvdT8m64Ix0hrS5vpO81KiskzyN+gGNFCQNI=; b=ka/8EBA9LPWYG36jipgeOeDrMPKmSgoHajkPGtl17UpvWpqyB+89rcqSlNnECrW1i3 LEvFdLW0hlHaNPIMt7Pa7EO4IRmZmIs5gw5VTXNUDKRdhCR0i/OKUUA/2sbtIJYJqAJX qZatWDdRxlK09OtKoEyDFlcHNLyPP/xuWPr62O49HZO2C59Csg0qWYFT5RC54ix3zSGU VCAJgj0vp+8N4obBiE7XCDTryxzjIhUkNfAM6gG/xIZ5vG4MF6KTEeQj81s7MV/+w7FB 3rqoaszUdry+YxpsdVXlzxZwgrQrXsFm6PF+pe75Hz2+nUzwBd7e2nRrAT4pD4VBO49j MgJg== X-Forwarded-Encrypted: i=1; AJvYcCVXZpWSepSLCQC3WZx7SU3uCRsF6yvo08iUrn01SutXaSUe14Z5lzWTSWUU+esKjFGl4PQgfTyeQIBRRRU=@vger.kernel.org X-Gm-Message-State: AOJu0Yyw1pzhb3ZOG1IGpI3hcP//HBPtrBO2NvVsfBLoLsj7kU57fTKW 3rIAV4O2T62YOwPKVKAyIk59M70WPsq0b2jvHfqXXZ693WNxcKBzVhrI/TqqPUEpQvg2yso62KF yVjHDh0aDi/iay019c4oXtam0otTdlgG0mncpqTO9c3KwVlETr2b8dZ8Bg2xL1g== X-Gm-Gg: ASbGncv5bLpU5O559ZnYpUTNw8EceOXc7UTdBNhLGFvTM2pdY5rW0BEDCN4PiSdZ2Lg NqX3kuu9oqmzWBoMulUtQtrColVgdwwtosJRVDPM6OzHrPCtTubnCztUr5tBcFR8VpVYkM8NZVK pISazVsxOMYzz9+JgWtuNdVTzaCqeFgOBCjx0tPGZjPdsSrs6B4r4H2kAQiHE/oPsWrz7VCvVFg FPbityU3P37bRLQoVucS5pAWoS8GszEffg16YwOJcYUdgw= X-Received: by 2002:a5d:64af:0:b0:386:1ab3:11f0 with SMTP id ffacd0b85a97d-38a8b0fa39dmr213712f8f.28.1736359586620; Wed, 08 Jan 2025 10:06:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyImssYlGKFMwIIkelKFtn5EBvRpRzebX/KbLVJOoRVPg+AYW6dhCm61RcqZ/eZtr4R9nAwQ== X-Received: by 2002:a5d:64af:0:b0:386:1ab3:11f0 with SMTP id ffacd0b85a97d-38a8b0fa39dmr213656f8f.28.1736359585987; Wed, 08 Jan 2025 10:06:25 -0800 (PST) Received: from step1.. ([5.77.93.126]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c8292f4sm54344839f8f.3.2025.01.08.10.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 10:06:25 -0800 (PST) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Simon Horman , Stefan Hajnoczi , linux-kernel@vger.kernel.org, Eric Dumazet , Xuan Zhuo , Wongi Lee , "David S. Miller" , Paolo Abeni , Jason Wang , Bobby Eshleman , virtualization@lists.linux.dev, =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Stefano Garzarella , Luigi Leonardi , bpf@vger.kernel.org, Jakub Kicinski , "Michael S. Tsirkin" , Hyunwoo Kim , Michal Luczaj , kvm@vger.kernel.org Subject: [PATCH net 1/2] vsock/virtio: discard packets if the transport changes Date: Wed, 8 Jan 2025 19:06:16 +0100 Message-ID: <20250108180617.154053-2-sgarzare@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250108180617.154053-1-sgarzare@redhat.com> References: <20250108180617.154053-1-sgarzare@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If the socket has been de-assigned or assigned to another transport, we must discard any packets received because they are not expected and would cause issues when we access vsk->transport. A possible scenario is described by Hyunwoo Kim in the attached link, where after a first connect() interrupted by a signal, and a second connect() failed, we can find `vsk->transport` at NULL, leading to a NULL pointer dereference. Fixes: c0cfa2d8a788 ("vsock: add multi-transports support") Reported-by: Hyunwoo Kim Reported-by: Wongi Lee Closes: https://lore.kernel.org/netdev/Z2LvdTTQR7dBmPb5@v4bel-B760M-AORUS-E= LITE-AX/ Signed-off-by: Stefano Garzarella --- net/vmw_vsock/virtio_transport_common.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio= _transport_common.c index 9acc13ab3f82..51a494b69be8 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -1628,8 +1628,11 @@ void virtio_transport_recv_pkt(struct virtio_transpo= rt *t, =20 lock_sock(sk); =20 - /* Check if sk has been closed before lock_sock */ - if (sock_flag(sk, SOCK_DONE)) { + /* Check if sk has been closed or assigned to another transport before + * lock_sock (note: listener sockets are not assigned to any transport) + */ + if (sock_flag(sk, SOCK_DONE) || + (sk->sk_state !=3D TCP_LISTEN && vsk->transport !=3D &t->transport)) { (void)virtio_transport_reset_no_sock(t, skb); release_sock(sk); sock_put(sk); --=20 2.47.1 From nobody Fri Dec 19 20:58:11 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EA88202C5A for ; Wed, 8 Jan 2025 18:06:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736359597; cv=none; b=nebLVeZz0NdQDJGtGuRFyGYwqqLudhQpezdJQfGsMAvicz0JJmGBLCOHUeoMsfTAXQNbkwN7yoCApVU+0Z4xZzJjOwybBTOuxn74kfOcmJZfn8by2YoKKBu4fk7kHvCG28iiQZzoDlJ1mQJ+7Kn15Rte/lR/herSULy/JiU0KnM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736359597; c=relaxed/simple; bh=NW1NN64WPOb8zvTk9pQc9y9wJMAUw7k5KI4tbn3qy4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lFvfe4vdFbasSkJ7vNlE33T2CeSXwtltb9jKpP9B+ocNNKTFLDi1lxwDa+/gbsiZSLwPOsZzqB2iOcW1BV0lS0S7w9StuzWNNNthQIZyGjLYhrPfIMEyblZCXWgLFtrM8grzDzL+0NfIKHgkhxcCcZiTXu8LdjJywkiaC1IX+0E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=bc1qGnB3; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bc1qGnB3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736359594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xTpnjYdFe65i9cQrDrcRqhmpYDaSR/fVnChURrprIX4=; b=bc1qGnB3bW6W0rYY89SyhwbWMM/ahLBNdXr2GQO6uG6SYN8HHNUl6Rnonz7kEhh1MqChEt yVCoTEPT1pPX15jQbSqgFZg22CI3SsoRvOSZthh2ypsAR113lIXnAupD0EqX4dLaQjgziX lv/3zT9M2BZIrz1DvTTLH9XhPtaItfU= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-1-VG_1lFOui3FGsbLvBGEA-1; Wed, 08 Jan 2025 13:06:33 -0500 X-MC-Unique: 1-VG_1lFOui3FGsbLvBGEA-1 X-Mimecast-MFC-AGG-ID: 1-VG_1lFOui3FGsbLvBGEA Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-436379713baso476525e9.2 for ; Wed, 08 Jan 2025 10:06:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736359592; x=1736964392; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xTpnjYdFe65i9cQrDrcRqhmpYDaSR/fVnChURrprIX4=; b=r//asfMlGLMHRwy6++y1jcfu20AwZjrmCS5apDipePAiv5GYDR5D3yO7jXPq34NGU9 l4fHg8d8KGLV6Nn4gbqo9ZbfNlSObYLSrxoOzg6Ig2dYuxhePm2QAXwumdihDYHe1s2c 6T4VTHG0QmQwYUblYQ1OFlBXWkw/6rH+fYgNYw5DCv/U6TP3Zx7nYoFG6SUYA8U9txUj uN9dNat8GQpr6JIQ5nce+/j7Kb+/p0SlYVgxme9FYXbl0jlJozlTAqrYuPOVbGfe0S8N n7yF1aq2U7vbqJhtnIjFkBE7uGq0gW8AmmjJqtP/v2RIutf5eBMQATo9QEbpNGK/8dnR h2aw== X-Forwarded-Encrypted: i=1; AJvYcCWtEQPcjHbCOMxHCJv5qRYJnGGueF9r2vABeh2+fXOTdsIreD36bP9KuPZga2WpzIHHyspfbz1lUE6MC3k=@vger.kernel.org X-Gm-Message-State: AOJu0YzVhOMbIxkP5aWRDkODrKsXv4JY8/jFfq1RS7EzkW1fNfQBNDT1 9p0dWMpQQTaNFAepOoRPTUjQGoO1PBd37QeZpW8ZFpPszy8VXQKZTpAcyY1GIkU+ZjQaxY3+iQZ mGA3/dyCT7rmP7a84A972PndOhEcg9Er2/PSslqCvWvCx9DrC3L2oM6KpT8ck1Rb3LHtV1QOC X-Gm-Gg: ASbGncvUyDKX8NJXVtRtMmC/1evBp7EdqnnyadSByyahgqhWq2PtxXz3e3RlO8bEeH6 kfb74gr7fy/TZ1Jld4eiT1wvuT+RQqFarFQScbJ5kHk43CZqZEDwQRUt63zzWs/GZsh0d+e2bJc PLjr05mXEqlcnHMo7P9w0uGVc0+u2OmM71KO3YdX0Y6nKmre80Rkww+n16CZvi36eXWhECqEUAB swf0vtlb5LL3s/PAUBes5oF/BWhXjwHCrEbgyOvVGVsAqQ= X-Received: by 2002:a05:600c:1d14:b0:436:5fc9:309d with SMTP id 5b1f17b1804b1-436e26f6d80mr37371045e9.30.1736359591820; Wed, 08 Jan 2025 10:06:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IHTv/Bx6C2k5LOcLLY/XN2JmilQSz5qyKDCjlMy44PV1BJ3rFBTpqkU5iqtg5HftWkhRLAW+A== X-Received: by 2002:a05:600c:1d14:b0:436:5fc9:309d with SMTP id 5b1f17b1804b1-436e26f6d80mr37370685e9.30.1736359591257; Wed, 08 Jan 2025 10:06:31 -0800 (PST) Received: from step1.. ([5.77.93.126]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2e89fc3sm28849325e9.30.2025.01.08.10.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 10:06:30 -0800 (PST) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Simon Horman , Stefan Hajnoczi , linux-kernel@vger.kernel.org, Eric Dumazet , Xuan Zhuo , Wongi Lee , "David S. Miller" , Paolo Abeni , Jason Wang , Bobby Eshleman , virtualization@lists.linux.dev, =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Stefano Garzarella , Luigi Leonardi , bpf@vger.kernel.org, Jakub Kicinski , "Michael S. Tsirkin" , Hyunwoo Kim , Michal Luczaj , kvm@vger.kernel.org Subject: [PATCH net 2/2] vsock/bpf: return early if transport is not assigned Date: Wed, 8 Jan 2025 19:06:17 +0100 Message-ID: <20250108180617.154053-3-sgarzare@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250108180617.154053-1-sgarzare@redhat.com> References: <20250108180617.154053-1-sgarzare@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some of the core functions can only be called if the transport has been assigned. As Michal reported, a socket might have the transport at NULL, for example after a failed connect(), causing the following trace: BUG: kernel NULL pointer dereference, address: 00000000000000a0 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 12faf8067 P4D 12faf8067 PUD 113670067 PMD 0 Oops: Oops: 0000 [#1] PREEMPT SMP NOPTI CPU: 15 UID: 0 PID: 1198 Comm: a.out Not tainted 6.13.0-rc2+ RIP: 0010:vsock_connectible_has_data+0x1f/0x40 Call Trace: vsock_bpf_recvmsg+0xca/0x5e0 sock_recvmsg+0xb9/0xc0 __sys_recvfrom+0xb3/0x130 __x64_sys_recvfrom+0x20/0x30 do_syscall_64+0x93/0x180 entry_SYSCALL_64_after_hwframe+0x76/0x7e So we need to check the `vsk->transport` in vsock_bpf_recvmsg(), especially for connected sockets (stream/seqpacket) as we already do in __vsock_connectible_recvmsg(). Fixes: 634f1a7110b4 ("vsock: support sockmap") Reported-by: Michal Luczaj Closes: https://lore.kernel.org/netdev/5ca20d4c-1017-49c2-9516-f6f75fd331e9= @rbox.co/ Signed-off-by: Stefano Garzarella Acked-by: Michael S. Tsirkin Reviewed-By: Luigi Leonardi Reviewed-by: Hyunwoo Kim Tested-by: Michal Luczaj --- net/vmw_vsock/vsock_bpf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/vmw_vsock/vsock_bpf.c b/net/vmw_vsock/vsock_bpf.c index 4aa6e74ec295..f201d9eca1df 100644 --- a/net/vmw_vsock/vsock_bpf.c +++ b/net/vmw_vsock/vsock_bpf.c @@ -77,6 +77,7 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msgh= dr *msg, size_t len, int flags, int *addr_len) { struct sk_psock *psock; + struct vsock_sock *vsk; int copied; =20 psock =3D sk_psock_get(sk); @@ -84,6 +85,13 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msg= hdr *msg, return __vsock_recvmsg(sk, msg, len, flags); =20 lock_sock(sk); + vsk =3D vsock_sk(sk); + + if (!vsk->transport) { + copied =3D -ENODEV; + goto out; + } + if (vsock_has_data(sk, psock) && sk_psock_queue_empty(psock)) { release_sock(sk); sk_psock_put(sk, psock); @@ -108,6 +116,7 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct ms= ghdr *msg, copied =3D sk_msg_recvmsg(sk, psock, msg, len, flags); } =20 +out: release_sock(sk); sk_psock_put(sk, psock); =20 --=20 2.47.1