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 691EC42B7B for ; Tue, 23 May 2023 04:16:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5945D42BDA; Tue, 23 May 2023 04:16:03 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id 560F740A80; Tue, 23 May 2023 04:16:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684808160; x=1716344160; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MACQ4o42cQsEm3lzsX1DD+R3jenHE+qpTVQ1ntNRoaI=; b=JYpZNxr0CIWeQzCA8EUIIJcLw/FVWv1z3d74DA70vtKBmckPcQX0X7qc TZoh3Hmy9OaYoP2t44z2DxjY1KHbHlLrm8LEPF84xOL6zAk/n4/ZUvGMq rjsXmHNMjkNyHjLSx0g/aZonSZOvWLkPI1RdaxqrMrqtd0CfQljcrrDn5 yil6cTT7wrfQV0PXOCGXG503Xb1w09yDeqaUpU4Z7NuuDNEplZtQHeM+G iC0EUNLcksj01uWKhYABaoMwZkBwZcWTqK6qU+maR8zE7xFT1JSvC+zGN JExCFkyVR2ViZwAu9KxUCV75VW0JhlE3VRVFwv0nppx+nSXc9h6s/Li8d g==; X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="337692352" X-IronPort-AV: E=Sophos;i="6.00,185,1681196400"; d="scan'208";a="337692352" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 19:15:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="768787092" X-IronPort-AV: E=Sophos;i="6.00,185,1681196400"; d="scan'208";a="768787092" Received: from dpdk-qzhan15-test02.sh.intel.com ([10.67.115.37]) by fmsmga008.fm.intel.com with ESMTP; 22 May 2023 19:15:57 -0700 From: Qi Zhang To: qiming.yang@intel.com Cc: dev@dpdk.org, Qi Zhang , stable@dpdk.org Subject: [PATCH v2] net/ice: fix data length check Date: Tue, 23 May 2023 06:35:09 -0400 Message-Id: <20230523103509.2918185-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230522181447.2747713-1-qi.z.zhang@intel.com> References: <20230522181447.2747713-1-qi.z.zhang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 In TSO, It is possible mbuf->data_len exceed mtu. Fixed the incorrect data length check in ice_prep_pkts. Fixes: ccf33dccf7aa ("net/ice: check illegal packet sizes") Cc: stable@dpdk.org Signed-off-by: Qi Zhang --- v2: - fix build warning drivers/net/ice/ice_rxtx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 560c1a4af7..cd0e61c85f 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3669,9 +3669,6 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, int i, ret; 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++) { m = tx_pkts[i]; @@ -3690,7 +3687,7 @@ 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) { + m->data_len > ICE_FRAME_SIZE_MAX) { rte_errno = EINVAL; PMD_DRV_LOG(ERR, "INVALID mbuf: bad data_len=[%hu]", m->data_len); return i; -- 2.31.1