From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C575546364 for ; Fri, 7 Mar 2025 13:48:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BEF0D40E30; Fri, 7 Mar 2025 13:48:21 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C665840E30 for ; Fri, 7 Mar 2025 13:48:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741351699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=98ToFPjnlEJm/Q4HEssCo9N8MDklQz+qN2xjrlBXZOE=; b=RBerPz3DnkFaNC9VKQGhquK1aIgwfQzUaqIjZICVbj9WtYhz2ouQB1zvtbxfgAfrZpg9z/ h1vkVSNwgIjAeUtfXs9Zi5A/n75d8u/1U81yDVrEMkZcjRsESvOIAJpUWd+s5nl1gG2VQ2 s3j5c2lkbNuKZjaPSih7BnM3qmy5Q2g= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-584-SX4giTsMM3WHZQY9Rw7kkA-1; Fri, 07 Mar 2025 07:48:16 -0500 X-MC-Unique: SX4giTsMM3WHZQY9Rw7kkA-1 X-Mimecast-MFC-AGG-ID: SX4giTsMM3WHZQY9Rw7kkA_1741351695 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8138A18001F7; Fri, 7 Mar 2025 12:48:15 +0000 (UTC) Received: from rh.Home (unknown [10.45.226.25]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CCEBF1955DDE; Fri, 7 Mar 2025 12:48:13 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Maxime Coquelin , dpdk stable Subject: patch 'vhost: check descriptor chains length' has been queued to stable release 24.11.2 Date: Fri, 7 Mar 2025 12:46:52 +0000 Message-ID: <20250307124726.475001-19-ktraynor@redhat.com> In-Reply-To: <20250307124726.475001-1-ktraynor@redhat.com> References: <20250307124726.475001-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: mYX_JF4iUjENSXw6QcTNH6B_qRZ6qR7weuIgad-tXEI_1741351695 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/12/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/3cd431c14cbe9e4f54f4748f4edc852ff56afd3c Thanks. Kevin --- >From 3cd431c14cbe9e4f54f4748f4edc852ff56afd3c Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 23 Dec 2024 11:29:21 +0800 Subject: [PATCH] vhost: check descriptor chains length [ upstream commit e31b57e732d52f3cd8c707824f79fef8c117df95 ] The descriptor chains length must be greater than the Virtio-net header size. Otherwise, such descriptor chains sizes implies no packet data. Fixes: fe8477ebbd94 ("vhost: support async packed ring dequeue") Signed-off-by: Yunjian Wang Reviewed-by: Maxime Coquelin --- lib/vhost/virtio_net.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c index d85c0c9d42..9a670df274 100644 --- a/lib/vhost/virtio_net.c +++ b/lib/vhost/virtio_net.c @@ -3968,4 +3968,14 @@ virtio_dev_tx_async_single_packed(struct virtio_net *dev, return -1; + if (unlikely(buf_len <= dev->vhost_hlen)) { + if (!allocerr_warned) { + VHOST_DATA_LOG(dev->ifname, ERR, "Invalid buffer length."); + allocerr_warned = true; + } + return -1; + } + + buf_len -= dev->vhost_hlen; + if (unlikely(virtio_dev_pktmbuf_prep(dev, pkts, buf_len))) { if (!allocerr_warned) { -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 11:02:57.598497955 +0000 +++ 0019-vhost-check-descriptor-chains-length.patch 2025-03-07 11:02:56.859335652 +0000 @@ -1 +1 @@ -From e31b57e732d52f3cd8c707824f79fef8c117df95 Mon Sep 17 00:00:00 2001 +From 3cd431c14cbe9e4f54f4748f4edc852ff56afd3c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e31b57e732d52f3cd8c707824f79fef8c117df95 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 0bf49169db..0348e8dac3 100644 +index d85c0c9d42..9a670df274 100644 @@ -23 +24 @@ -@@ -3961,4 +3961,14 @@ virtio_dev_tx_async_single_packed(struct virtio_net *dev, +@@ -3968,4 +3968,14 @@ virtio_dev_tx_async_single_packed(struct virtio_net *dev,