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 A494545DB9 for ; Wed, 27 Nov 2024 18:23:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A02DB402DE; Wed, 27 Nov 2024 18:23:26 +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 C4325402DE for ; Wed, 27 Nov 2024 18:23:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728204; 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=PcKAk22CcMwR1HAzFsKR8RZNeYImhgZa+ygdc/0furA=; b=hKG0QD5GoqOAy62ScYIi42+96+/+opQtexbDMNDkdHzdUJE/SJ/F+BefhceIpr/Ie6hSru vA02+Ce2345G3BhOkWm/bxsBlmvM/2mVd5xYQlA+ZUdjJx7ydxQ7/2mtKselJzvAM7ueJ7 mg9UGz9z3AVmgyJ7Dcy4McByLiQ1weU= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-488-bNjzTTVpPy6KVfSrKVXLcQ-1; Wed, 27 Nov 2024 12:23:21 -0500 X-MC-Unique: bNjzTTVpPy6KVfSrKVXLcQ-1 X-Mimecast-MFC-AGG-ID: bNjzTTVpPy6KVfSrKVXLcQ Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1054A1955EEA; Wed, 27 Nov 2024 17:23:20 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2EA663003B74; Wed, 27 Nov 2024 17:23:17 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Padraig Connolly , Vladimir Medvedkin , dpdk stable Subject: patch 'net/iavf: add segment-length check to Tx prep' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:58 +0000 Message-ID: <20241127171916.690404-111-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: IEljNJKLFKt-lsO9xD1uX5LYnGKmiS8KnqO-WYpbaq8_1732728200 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 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. 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/0978ac413671a3e9dffb9b2d614376082bc3dc85 Thanks. Kevin --- >From 0978ac413671a3e9dffb9b2d614376082bc3dc85 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 11 Nov 2024 16:42:20 +0000 Subject: [PATCH] net/iavf: add segment-length check to Tx prep [ upstream commit 4523e0753b243066357f98fd9739fde72605d0fb ] In the Tx prep function, the metadata checks were only checking the packet length and ignoring the data length. For single-buffer packets we can quickly check that the data length is the packet length. Fixes: 19ee91c6bd9a ("net/iavf: check illegal packet sizes") Reported-by: Padraig Connolly Signed-off-by: Bruce Richardson Acked-by: Vladimir Medvedkin Tested-by: Padraig Connolly --- drivers/net/iavf/iavf_rxtx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index c932b7859e..6bbf7f4e0f 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -2817,5 +2817,9 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, } - if (m->pkt_len < IAVF_TX_MIN_PKT_LEN) { + /* valid packets are greater than min size, and single-buffer pkts + * must have data_len == pkt_len + */ + if (m->pkt_len < IAVF_TX_MIN_PKT_LEN || + (m->nb_segs == 1 && m->data_len != m->pkt_len)) { rte_errno = EINVAL; return i; -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.755175912 +0000 +++ 0111-net-iavf-add-segment-length-check-to-Tx-prep.patch 2024-11-27 17:17:38.342269980 +0000 @@ -1 +1 @@ -From 4523e0753b243066357f98fd9739fde72605d0fb Mon Sep 17 00:00:00 2001 +From 0978ac413671a3e9dffb9b2d614376082bc3dc85 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4523e0753b243066357f98fd9739fde72605d0fb ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 4850b9e381..6a093c6746 100644 +index c932b7859e..6bbf7f4e0f 100644 @@ -25 +26 @@ -@@ -3678,5 +3678,9 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -2817,5 +2817,9 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,