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 DFF48A054A for ; Tue, 25 Oct 2022 17:09:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DBF8A42C3D; Tue, 25 Oct 2022 17:09:43 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0CF6642C4C for ; Tue, 25 Oct 2022 17:09:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710581; 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=S7RGa2s8gcqSmRkoj5wHTHTrwe7TA94jssQ4+7bKx1Q=; b=Ngq65gs+P7j95Ef/brtcs0myIyaPtbz0/gv2fmO31I8hpvLkgzb7q9YQAiUfdSmZXaniVO aaiNdcEaYD2KCwgREyBW/XuBNOruoAXzX+Q5Ce51tFeQKC3ZvFprHtOz11t05m+JT6/jyd /vhrJOAlJDhwQzsfMwvTQq2+xujY1zI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-651-fpuevbmsMrmfI4GMkn9bbA-1; Tue, 25 Oct 2022 11:09:40 -0400 X-MC-Unique: fpuevbmsMrmfI4GMkn9bbA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 73423101A52A; Tue, 25 Oct 2022 15:09:39 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F245492CA5; Tue, 25 Oct 2022 15:09:38 +0000 (UTC) From: Kevin Traynor To: Kevin Liu Cc: Qi Zhang , dpdk stable Subject: patch 'net/ice: check illegal packet sizes' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:08 +0100 Message-Id: <20221025150734.142189-73-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/22. 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/d141aba6a03f8b95c350fcf0d933d3f09b4895b5 Thanks. Kevin --- >From d141aba6a03f8b95c350fcf0d933d3f09b4895b5 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Tue, 27 Sep 2022 07:15:22 +0000 Subject: [PATCH] net/ice: check illegal packet sizes [ upstream commit ccf33dccf7aaf208ef67ed7b8ef45d05bce5e3a5 ] If the length of data_len in mbuf is less than 17 or greater than the maximum frame size, it is illegal. These illegal packets will lead to Tx/Rx hang and can't recover automatically. This patch check those illegal packets and protect Tx/Rx from hanging. Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") Signed-off-by: Kevin Liu Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 11 +++++++++++ drivers/net/ice/ice_rxtx.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 71e5c6f5d6..e64fb00792 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3460,4 +3460,7 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, uint64_t ol_flags; struct rte_mbuf *m; + struct ice_tx_queue *txq = tx_queue; + struct rte_eth_dev *dev = &rte_eth_devices[txq->port_id]; + uint16_t max_frame_size = dev->data->mtu + ICE_ETH_OVERHEAD; for (i = 0; i < nb_pkts; i++) { @@ -3476,4 +3479,12 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, } + /* check the data_len in mbuf */ + if (m->data_len < ICE_TX_MIN_PKT_LEN || + m->data_len > max_frame_size) { + rte_errno = EINVAL; + PMD_DRV_LOG(ERR, "INVALID mbuf: bad data_len=[%hu]", m->data_len); + return i; + } + #ifdef RTE_ETHDEV_DEBUG_TX ret = rte_validate_tx_offload(m); diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h index f5337d5284..e86c8977e4 100644 --- a/drivers/net/ice/ice_rxtx.h +++ b/drivers/net/ice/ice_rxtx.h @@ -41,4 +41,6 @@ #define ICE_RXDID_COMMS_OVS 22 +#define ICE_TX_MIN_PKT_LEN 17 + extern uint64_t ice_timestamp_dynflag; extern int ice_timestamp_dynfield_offset; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.205973126 +0100 +++ 0073-net-ice-check-illegal-packet-sizes.patch 2022-10-25 14:18:58.500798410 +0100 @@ -1 +1 @@ -From ccf33dccf7aaf208ef67ed7b8ef45d05bce5e3a5 Mon Sep 17 00:00:00 2001 +From d141aba6a03f8b95c350fcf0d933d3f09b4895b5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ccf33dccf7aaf208ef67ed7b8ef45d05bce5e3a5 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 5af7c0c8f6..d1e1fadf9d 100644 +index 71e5c6f5d6..e64fb00792 100644 @@ -29 +30 @@ -@@ -3443,4 +3443,7 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -3460,4 +3460,7 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -37 +38 @@ -@@ -3459,4 +3462,12 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +@@ -3476,4 +3479,12 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -51 +52 @@ -index 6c08c175dc..e1d4fe8e47 100644 +index f5337d5284..e86c8977e4 100644