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 564F4A0C41 for ; Tue, 30 Nov 2021 17:42:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 501E2410F7; Tue, 30 Nov 2021 17:42:02 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 69FCE4118F for ; Tue, 30 Nov 2021 17:41:59 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4467C40037 for ; Tue, 30 Nov 2021 16:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290519; bh=vpdAkYNpxx4C2qbvhgxDRM45H8PInt6KclLp+HPGn/c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=i11MjzQE5eret8H5b+oHCOXKDdlzh4/My0sgHRhG/2JmIHVZAKj1Hrici9DYBc9mS 6ARX+DumW9k6rLuaZEaJA4q9OJJBXp1f+6x+BI0f5SHtStN7X3AQIfldLk4jcjn8SV qWNxTibM7B+EmTQHi4OY33tm4a1IPUZVOPXJu1AOpYtir5PhSe+naBceOLPhi0ifyL nbyh2wKA5NuHTesTdRm+r71l3XGQs7ulo4t+EcR8s6usOX8cKGYVUUr+Fd3+4ROzuZ LRyRpitG3ll7jFpZyY55fTRIrYdAZJuE2d5uIZkbSa+4mnJi2CY0U5NmzkMKDADhFs ABj1ka8uTDtuw== Received: by mail-ed1-f69.google.com with SMTP id b15-20020aa7c6cf000000b003e7cf0f73daso17415090eds.22 for ; Tue, 30 Nov 2021 08:41:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vpdAkYNpxx4C2qbvhgxDRM45H8PInt6KclLp+HPGn/c=; b=IOa6i+CFWeDGvwDwphIwmXjZh6tENKvAQYKCyhSVVgSmhhb4Z8XhxkiRWhlt1vE94W Kx+b/Q+eCI3fV7/XN8elOvDIHd29bHnYRPBJQO4WM7z1qUUaJ8nSqq0uvnyIfG6ToJMv 6GnqhFtZNw4SCRSmiElAFNbuJ/7r0HyS980xQkW9X9nOsC8uDhiaHXcPVsBkpqDpK9pp AjQ6BHig2e87Yv7RdDKoEefMfuwhpHZal8ZYMniXGOTUqytNHW5Km4/aatCdKKtsLk5L nFPCA1R/3ysQe6wqyfWTECeTWHOdawsfkXCN+ieuCOOR//9sFTerVHBr+tNX6NjTRgWY ec2g== X-Gm-Message-State: AOAM530iCLqQtVNI8LruvsUsCApff2SErSEIhyAkHaAPkayMfIqqZYkK avyokuQ9Eh4sTTEmroK7GnsyWrOJyO8x6NgahP11QWutkzqqPpXMP5jy0ZQhY6c0jJ9Nbt9eO9M MYwCwFEB2ka3hlobvOZTGsX3f X-Received: by 2002:aa7:cb45:: with SMTP id w5mr14213edt.405.1638290518747; Tue, 30 Nov 2021 08:41:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRHBuJ2LKiyTBghObJg/nqoFtttQ2ZWHWBrMU0vp/VizLaJgyg+wcLBAnjPVYUBQmVUhM1jg== X-Received: by 2002:aa7:cb45:: with SMTP id w5mr14182edt.405.1638290518559; Tue, 30 Nov 2021 08:41:58 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id ds17sm9708918ejc.45.2021.11.30.08.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:41:58 -0800 (PST) From: christian.ehrhardt@canonical.com To: Ferruh Yigit Cc: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix 32-bit build' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:18 +0100 Message-Id: <20211130163605.2460997-114-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/698e296cd7b31f0dcabdf5332498c0d09a5bf1ab Thanks. Christian Ehrhardt --- >From 698e296cd7b31f0dcabdf5332498c0d09a5bf1ab Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Fri, 29 Oct 2021 11:37:01 +0100 Subject: [PATCH] net/i40e: fix 32-bit build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit d01201829b88fe823e0b99cd13a65e1711cd8973 ] Got error with: gcc 11.2.1 "cc (GCC) 11.2.1 20210728 (Red Hat 11.2.1-1)" Build error: In function ‘i40e_flow_parse_fdir_pattern’, inlined from ‘i40e_flow_parse_fdir_filter’ at ../drivers/net/i40e/i40e_flow.c:3274:8: ../drivers/net/i40e/i40e_flow.c:3052:69: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] 3052 | filter->input.flow_ext.flexbytes[j] = | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^ 3053 | raw_spec->pattern[i]; | ~~~~~~~~~~~~~~~~~~~~ In file included from ../drivers/net/i40e/i40e_flow.c:25: ../drivers/net/i40e/i40e_flow.c: In function ‘i40e_flow_parse_fdir_filter’: ../drivers/net/i40e/i40e_ethdev.h:638:17: note: at offset 16 into destination object ‘flexbytes’ of size 16 638 | uint8_t flexbytes[RTE_ETH_FDIR_MAX_FLEXLEN]; | ^~~~~~~~~ Fixing by adding range checks. Fixes: 6ced3dd72f5f ("net/i40e: support flexible payload parsing for FDIR") Signed-off-by: Ferruh Yigit Acked-by: Qi Zhang --- drivers/net/i40e/i40e_flow.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c index b43f27d354..3862fb80d4 100644 --- a/drivers/net/i40e/i40e_flow.c +++ b/drivers/net/i40e/i40e_flow.c @@ -2901,6 +2901,9 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, for (i = 0; i < raw_spec->length; i++) { j = i + next_dst_off; + if (j >= RTE_ETH_FDIR_MAX_FLEXLEN || + j >= I40E_FDIR_MAX_FLEX_LEN) + break; filter->input.flow_ext.flexbytes[j] = raw_spec->pattern[i]; filter->input.flow_ext.flex_mask[j] = -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:12.518854015 +0100 +++ 0114-net-i40e-fix-32-bit-build.patch 2021-11-30 16:50:05.930874557 +0100 @@ -1 +1 @@ -From d01201829b88fe823e0b99cd13a65e1711cd8973 Mon Sep 17 00:00:00 2001 +From 698e296cd7b31f0dcabdf5332498c0d09a5bf1ab Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit d01201829b88fe823e0b99cd13a65e1711cd8973 ] + @@ -33 +34,0 @@ -Cc: stable@dpdk.org @@ -42 +43 @@ -index 9acaa18751..c9676caab5 100644 +index b43f27d354..3862fb80d4 100644 @@ -45 +46 @@ -@@ -3049,6 +3049,9 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev, +@@ -2901,6 +2901,9 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,