From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 33ECC2571CE; Mon, 24 Feb 2025 14:49:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740408554; cv=none; b=dEsh03n0L0LCnHgcivQnBVT14A2JmaSsEF1PNBHjl9qGAaJwuCqkPrP0bMNtjCH4Z083Sb1Gc/ed4W605zpaPY8uFIa3USn72a9CKBlNRTyan6g+4XLiLYvrbvLBa62Q4+bBN36QKywLA1BtC3TFruotBhfQuvli1BkXUC+KlFI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740408554; c=relaxed/simple; bh=vUmwPAu+VnjPtlWgQes/DbTO5uPfwAB3SUAuTYCi538=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cvGfC/vMf/UGkI5DHHp1guStmDlZvkSqLPvHuZUYLtFz8gPBfZ0wrm4tX2SViCBnVgvUQuoYBNd4XxOl4CSEnGL8YxYUpwT4oWr7of12b/Mz1dGS/Ajd3PP9vt2TL+s5BPIWCT5V+6sYOtV0oSx4WQOdnR4wVBl1v6i7EQH50Ws= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EfVpUAO+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EfVpUAO+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98517C4CED6; Mon, 24 Feb 2025 14:49:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1740408554; bh=vUmwPAu+VnjPtlWgQes/DbTO5uPfwAB3SUAuTYCi538=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EfVpUAO+Y+X+PpUPggBJQqLlUg+gYnkh5RfosXLv7TUJsxpkUD1mEC74AGwgY9igy xKwXGiwqzWmvHZF5rKxNqYQGSgPy6hmZD4ICH34AZY+VUHTVh2/flPVirT7S4OJw04 x9W+xnY8UjZGNLRegz2eT8sVV/NYyWj1DIn/c1sk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michal Luczaj , Stefano Garzarella , Paolo Abeni , Sasha Levin Subject: [PATCH 6.12 060/154] vsock/bpf: Warn on socket without transport Date: Mon, 24 Feb 2025 15:34:19 +0100 Message-ID: <20250224142609.435492408@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224142607.058226288@linuxfoundation.org> References: <20250224142607.058226288@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michal Luczaj [ Upstream commit 857ae05549ee2542317e7084ecaa5f8536634dd9 ] In the spirit of commit 91751e248256 ("vsock: prevent null-ptr-deref in vsock_*[has_data|has_space]"), armorize the "impossible" cases with a warning. Fixes: 634f1a7110b4 ("vsock: support sockmap") Signed-off-by: Michal Luczaj Reviewed-by: Stefano Garzarella Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/vmw_vsock/af_vsock.c | 3 +++ net/vmw_vsock/vsock_bpf.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 37299a7ca1876..eb6ea26b390ee 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -1189,6 +1189,9 @@ static int vsock_read_skb(struct sock *sk, skb_read_actor_t read_actor) { struct vsock_sock *vsk = vsock_sk(sk); + if (WARN_ON_ONCE(!vsk->transport)) + return -ENODEV; + return vsk->transport->read_skb(vsk, read_actor); } diff --git a/net/vmw_vsock/vsock_bpf.c b/net/vmw_vsock/vsock_bpf.c index f201d9eca1df2..07b96d56f3a57 100644 --- a/net/vmw_vsock/vsock_bpf.c +++ b/net/vmw_vsock/vsock_bpf.c @@ -87,7 +87,7 @@ static int vsock_bpf_recvmsg(struct sock *sk, struct msghdr *msg, lock_sock(sk); vsk = vsock_sk(sk); - if (!vsk->transport) { + if (WARN_ON_ONCE(!vsk->transport)) { copied = -ENODEV; goto out; } -- 2.39.5