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 23D2AA0544 for ; Fri, 11 Nov 2022 12:39:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1EF0940150; Fri, 11 Nov 2022 12:39:58 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id B3A2740141 for ; Fri, 11 Nov 2022 12:39:55 +0100 (CET) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.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-1.canonical.com (Postfix) with ESMTPS id 4AF2241319 for ; Fri, 11 Nov 2022 11:39:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668166795; bh=kzLm0YkmP+tbxMhvGubS38Pa7uYaH9CFKrvY6Bq6Y0o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=favFUlUKVKd3GCLsuyiHthwISCWecOZC41gcebf1Qb7iZ48g6bcA4Yz+STXYCvo/M 9RaVNpqPm6PmQiLr4dyyEowJDzP+CoJ9AdNPXkzTWJOK0UIVrF2JMqfVfQIDY3I45Z OVBUeOgZf9UcMdIXZ+WgJ4PQ3GCvqU/eAD2fgTqpuq4TYuSsIh73ZAe9rXotlJ/r02 kd0FOhikl6AwcM4XCMqMgkKLhvZ3l+t6evRvNMMxHxjmL0j+jhZOdCFcHdefGz4l3r nbN/mlOeyXkkDSPPHP3ZKGQtyUZCkEACEw9Gt7jOvVbjI7dLoMGj9ksYfjn1SOXKza B/hlsudBUXx2g== Received: by mail-ej1-f69.google.com with SMTP id xc12-20020a170907074c00b007416699ea14so2887069ejb.19 for ; Fri, 11 Nov 2022 03:39:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kzLm0YkmP+tbxMhvGubS38Pa7uYaH9CFKrvY6Bq6Y0o=; b=xmA4jGKp/NTRVHdJt5Mjqw+nsPjNXuMAHwl7QiT8DxER3cK6hU3UuZ9saucGswt60X j8htbBJNbIw99aICaXEfMT5bUxwI7TUnYamZeUjfgHKNd+4DVyxijxhd+qplwLyB02OK uC40IzM48P4V/x1JDMu8AHLynmKYn7BXh2qXsgfRbkyOQeaUzrf+YSDCQ+2wCXYaJ44h 4EH+lu+PFdWYKUGDEApjioA4pNLnm8RVna2E6lV37Gki+FBsC1XliqCuVUVvbe7KQ8Fo T1COExszTTEU+olj0vWSgLF/qwvcNVXAkf2c2gSw7w/VP7W0MzL92804HV9VlPJcfEhn dmhA== X-Gm-Message-State: ANoB5pnMxuYYUvHZKMsGUbHnte3LfZuNw0bLkS9UpniX/2Ejs3+yuoQP cKIjH/PSU9UHzhi1xqi/bCdY9p0Jig+rQmQaZ1c2c7BRCml2sZz1dOaL5StOliDbThswzk/kQsy l4ugiv7Dz2mxgS6gDES8gp6Il X-Received: by 2002:a17:906:af76:b0:7ae:4ed4:eede with SMTP id os22-20020a170906af7600b007ae4ed4eedemr1489170ejb.240.1668166794713; Fri, 11 Nov 2022 03:39:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf4dz3000fuHuDj1LVGG6nesVmR7eJ7eVW9vyXydRuXQXqGorjNQwt5ZKssdTKrCEmKr6hn/wA== X-Received: by 2002:a17:906:af76:b0:7ae:4ed4:eede with SMTP id os22-20020a170906af7600b007ae4ed4eedemr1489156ejb.240.1668166794430; Fri, 11 Nov 2022 03:39:54 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39af:c100:1891:6c61:50fd:e567]) by smtp.gmail.com with ESMTPSA id v17-20020a1709067d9100b0074134543f82sm796944ejo.90.2022.11.11.03.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:39:53 -0800 (PST) From: christian.ehrhardt@canonical.com To: Amit Prakash Shukla Cc: Konstantin Ananyev , dpdk stable Subject: patch 'ipsec: fix build with GCC 12' has been queued to stable release 19.11.14 Date: Fri, 11 Nov 2022 12:38:32 +0100 Message-Id: <20221111113904.1549618-15-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> References: <20221111113904.1549618-1-christian.ehrhardt@canonical.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 Hi, FYI, your patch has been queued to stable release 19.11.14 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/18/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/3b5df1527709de10d048ae48f0551c9f089cebf6 Thanks. Christian Ehrhardt --- >From 3b5df1527709de10d048ae48f0551c9f089cebf6 Mon Sep 17 00:00:00 2001 From: Amit Prakash Shukla Date: Thu, 4 Aug 2022 19:10:54 +0530 Subject: [PATCH] ipsec: fix build with GCC 12 [ upstream commit 2be383423e433b5d42324cb450589b46d057c2ed ] GCC 12 raises the following warning: In function '_mm_loadu_si128', inlined from 'rte_mov16' at ../lib/eal/x86/include/rte_memcpy.h:507:9, inlined from 'rte_mov128' at ../lib/eal/x86/include/rte_memcpy.h:549:2, inlined from 'rte_memcpy_generic' at ../lib/eal/x86/include/rte_memcpy.h:732:4, inlined from 'rte_memcpy' at ../lib/eal/x86/include/rte_memcpy.h:882:10, inlined from 'outb_tun_pkt_prepare' at ../lib/ipsec/esp_outb.c:224:2: /usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/include/emmintrin.h:703:10: error: array subscript '__m128i_u[15]' is partly outside array bounds of 'const uint8_t[255]' {aka 'const unsigned char[255]'} [-Werror=array-bounds] 703 | return *__P; | ^~~~ In file included from ../lib/ipsec/esp_outb.c:17: ../lib/ipsec/pad.h: In function 'outb_tun_pkt_prepare': ../lib/ipsec/pad.h:10:22: note: at offset 240 into object 'esp_pad_bytes' of size 255 10 | static const uint8_t esp_pad_bytes[IPSEC_MAX_PAD_SIZE] = { | ^~~~~~~~~~~~~ This patch restrict copy to minimum size. Bugzilla ID: 1060 Fixes: 6015e6a13398 ("ipsec: move inbound and outbound code") Signed-off-by: Amit Prakash Shukla Acked-by: Konstantin Ananyev --- lib/librte_ipsec/esp_outb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/librte_ipsec/esp_outb.c b/lib/librte_ipsec/esp_outb.c index 31b920f651..7e7340871a 100644 --- a/lib/librte_ipsec/esp_outb.c +++ b/lib/librte_ipsec/esp_outb.c @@ -169,8 +169,10 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, /* pad length */ pdlen -= sizeof(*espt); + RTE_ASSERT(pdlen <= sizeof(esp_pad_bytes)); + /* copy padding data */ - rte_memcpy(pt, esp_pad_bytes, pdlen); + rte_memcpy(pt, esp_pad_bytes, RTE_MIN(pdlen, sizeof(esp_pad_bytes))); /* update esp trailer */ espt = (struct rte_esp_tail *)(pt + pdlen); @@ -332,8 +334,10 @@ outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, /* pad length */ pdlen -= sizeof(*espt); + RTE_ASSERT(pdlen <= sizeof(esp_pad_bytes)); + /* copy padding data */ - rte_memcpy(pt, esp_pad_bytes, pdlen); + rte_memcpy(pt, esp_pad_bytes, RTE_MIN(pdlen, sizeof(esp_pad_bytes))); /* update esp trailer */ espt = (struct rte_esp_tail *)(pt + pdlen); -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 12:35:05.323732256 +0100 +++ 0015-ipsec-fix-build-with-GCC-12.patch 2022-11-11 12:35:04.741191886 +0100 @@ -1 +1 @@ -From 2be383423e433b5d42324cb450589b46d057c2ed Mon Sep 17 00:00:00 2001 +From 3b5df1527709de10d048ae48f0551c9f089cebf6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2be383423e433b5d42324cb450589b46d057c2ed ] + @@ -36 +37,0 @@ -Cc: stable@dpdk.org @@ -41 +42 @@ - lib/ipsec/esp_outb.c | 8 ++++++-- + lib/librte_ipsec/esp_outb.c | 8 ++++++-- @@ -44,5 +45,5 @@ -diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c -index 5a5429a12b..9cbd9202f6 100644 ---- a/lib/ipsec/esp_outb.c -+++ b/lib/ipsec/esp_outb.c -@@ -219,8 +219,10 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, +diff --git a/lib/librte_ipsec/esp_outb.c b/lib/librte_ipsec/esp_outb.c +index 31b920f651..7e7340871a 100644 +--- a/lib/librte_ipsec/esp_outb.c ++++ b/lib/librte_ipsec/esp_outb.c +@@ -169,8 +169,10 @@ outb_tun_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, @@ -60 +61 @@ -@@ -416,8 +418,10 @@ outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc, +@@ -332,8 +334,10 @@ outb_trs_pkt_prepare(struct rte_ipsec_sa *sa, rte_be64_t sqc,