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 BD0583AB27A; Fri, 15 May 2026 15:15:38 +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=1778858138; cv=none; b=oPsUsJBn8rBBGqzai5N0NpGmN7vBkEN71wu5QwTnAAlmFCR/KE7xgZjVPSKPJ5IKr0rBhqei03UaxeuUfKJb8zyPK4culdmTpcgY836NV/zHUq3Lxi2GG3DL4smxC17NVFTb6yLl522hEGoju2aSAXGwGRW4auUTvGMKBnyMm34= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778858138; c=relaxed/simple; bh=Pw3UfixOuAL67k+xik3CQ6SuJyjRlkjIPzNXh0aEyis=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=BUPhmGRIiK7myPBtsY/6oKr1u41toRTwsf1mr0n4K6c5AtJIjxm8dOiRh7yVL9xDnLzi4umfO9EEtFEtlYNjnx/M4BElMyOHJy+Y8Q6SdjrES5A/POY8Q1i0BnDR3l11gGJHGt4p3+W7G3fiWX4lq26wptAsXKVWsEhKEWoyVyw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UZTRn+Na; 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="UZTRn+Na" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2AEB5C2BCB0; Fri, 15 May 2026 15:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778858138; bh=Pw3UfixOuAL67k+xik3CQ6SuJyjRlkjIPzNXh0aEyis=; h=Subject:To:Cc:From:Date:From; b=UZTRn+NapmRG8CnSCA5qSEHFFUNyd8FvM2ES3KzDbjPPxXvphCEVtMSTkrIW5GVtR zrva9VI1Yi0acZcG1vrT+mMPCmb1DVIdLEdmIYanqRFHk1oIo14Fc3JDK9ElJ4iW+n boRqMb0o6+aldogs7DjslKo9qNa7TVgrU5afow4Q= Subject: Patch "vsock/virtio: fix potential unbounded skb queue" has been added to the 6.18-stable tree To: AVKrasnov@sberdevices.ru,edumazet@google.com,eperezma@redhat.com,gregkh@linuxfoundation.org,jasowang@redhat.com,kuba@kernel.org,leonardi@redhat.com,mst@redhat.com,sgarzare@redhat.com,stefanha@redhat.com,virtualization@lists.linux.dev,xuanzhuo@linux.alibaba.com Cc: From: Date: Fri, 15 May 2026 17:15:19 +0200 Message-ID: <2026051519-monument-regulator-e2fb@gregkh> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore This is a note to let you know that I've just added the patch titled vsock/virtio: fix potential unbounded skb queue to the 6.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: vsock-virtio-fix-potential-unbounded-skb-queue.patch and it can be found in the queue-6.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From 059b7dbd20a6f0c539a45ddff1573cb8946685b5 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 30 Apr 2026 12:26:52 +0000 Subject: vsock/virtio: fix potential unbounded skb queue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Eric Dumazet commit 059b7dbd20a6f0c539a45ddff1573cb8946685b5 upstream. virtio_transport_inc_rx_pkt() checks vvs->rx_bytes + len > vvs->buf_alloc. virtio_transport_recv_enqueue() skips coalescing for packets with VIRTIO_VSOCK_SEQ_EOM. If fed with packets with len == 0 and VIRTIO_VSOCK_SEQ_EOM, a very large number of packets can be queued because vvs->rx_bytes stays at 0. Fix this by estimating the skb metadata size: (Number of skbs in the queue) * SKB_TRUESIZE(0) Fixes: 077706165717 ("virtio/vsock: don't use skbuff state to account credit") Signed-off-by: Eric Dumazet Cc: Arseniy Krasnov Cc: Stefan Hajnoczi Cc: Stefano Garzarella Cc: "Michael S. Tsirkin" Cc: Jason Wang Cc: Xuan Zhuo Cc: "Eugenio Pérez" Cc: virtualization@lists.linux.dev Link: https://patch.msgid.link/20260430122653.554058-1-edumazet@google.com Signed-off-by: Jakub Kicinski Cc: Luigi Leonardi Signed-off-by: Greg Kroah-Hartman --- net/vmw_vsock/virtio_transport_common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -429,7 +429,9 @@ static int virtio_transport_send_pkt_inf static bool virtio_transport_inc_rx_pkt(struct virtio_vsock_sock *vvs, u32 len) { - if (vvs->buf_used + len > vvs->buf_alloc) + u64 skb_overhead = (skb_queue_len(&vvs->rx_queue) + 1) * SKB_TRUESIZE(0); + + if (skb_overhead + vvs->buf_used + len > vvs->buf_alloc) return false; vvs->rx_bytes += len; Patches currently in stable-queue which might be from edumazet@google.com are queue-6.18/vsock-virtio-fix-potential-unbounded-skb-queue.patch