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 90813A0544 for ; Fri, 11 Nov 2022 12:40:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7FFE342B7E; Fri, 11 Nov 2022 12:40:10 +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 4A3414014F for ; Fri, 11 Nov 2022 12:40:09 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (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 7B7233F0C8 for ; Fri, 11 Nov 2022 11:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668166808; bh=aaphUO4/SFE9lzZL2TOcPpz/HgtSaOf/pz7Vpt62xUw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BULQJGa5tW6/621QdxdIjlEXngShk29Jzd3hPCt4BYtx/7X0hxyMw9WKYufaTq4PK js0NgFU25f0t0+dScDTpV4ZevK/MgBY8WvH4JA7kBKbhk09MiotmoEzFqZu39n1eqf 8T4lXx1zxJfimxx3P0crHAgVLi+z9qSCPXrutXU19bBpQI9l23Aa4CJnppVMSTR09k UPeCrms73BCO3Fe7hD/ECAO6pdQEEJrkm1UyH8fxUjpBtPpvkKT7+7oYWRpL/c0Qx9 8jQSNxdCw9jlWSjo6tCOWQ92QtsWzNjtAdvsiX475tGD8iPwlz/i0ugeTdnVDuGa9V uq3/+UmfR1NCQ== Received: by mail-ed1-f72.google.com with SMTP id w17-20020a056402269100b00461e28a75ccso3447490edd.8 for ; Fri, 11 Nov 2022 03:40:08 -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=aaphUO4/SFE9lzZL2TOcPpz/HgtSaOf/pz7Vpt62xUw=; b=CFA6R3pXzJgq402n7epf6QtuRufA28XFK5+ATWOLly/MxPwFTV0qGZyXbFKCFQsZXD IoFLo35sRZ/B0LTH7f1k9Jfnd/oSl4SK2oLC5nuQY+NXiIAvZy6G2111JUpBfHCba83H TWnZd9626SaQe0In3cw457NgBiQXFEYebHoK95MXH90wtENf6G/Gyuew8RCJrjnHrmn+ jxRwtR3+37FYEe6owvLwX5935Fe63bjlAPGbHyUhs2KsMYbheS9LFGG2wYWDS97rNP/C lVkSNDMhT4r/gpntZA6CdCXUHWe13VzCkYkRVB5NrfL7qhQFM47Oif4ab35nPYdJQVa6 PnzQ== X-Gm-Message-State: ANoB5pm+7D8eVHvh7FHMcvIUdLZ4HdLezJx3KCSnfdefSPgi0oVBfr5m 4HQIQN7x8iET+tq46KusLj57/tbrJqh1KZC8z1VOVHkJ69Wnf3wxE3DGVb0MracWTbfpoqDeguG NhZiBz7hSn6q1+MDKQoooTNfY X-Received: by 2002:a17:907:c286:b0:730:631c:40b7 with SMTP id tk6-20020a170907c28600b00730631c40b7mr1528183ejc.336.1668166806010; Fri, 11 Nov 2022 03:40:06 -0800 (PST) X-Google-Smtp-Source: AA0mqf7z14CfdF+ZsbeghrekMl6vFKV422fS1VWhC0tRpfZ1hRXsdRAxl4tyh2fiQepFVgAqMVaY5w== X-Received: by 2002:a17:907:c286:b0:730:631c:40b7 with SMTP id tk6-20020a170907c28600b00730631c40b7mr1528175ejc.336.1668166805790; Fri, 11 Nov 2022 03:40:05 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39af:c100:1891:6c61:50fd:e567]) by smtp.gmail.com with ESMTPSA id s6-20020a170906bc4600b007815ca7ae57sm751435ejv.212.2022.11.11.03.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:40:05 -0800 (PST) From: christian.ehrhardt@canonical.com To: Amit Prakash Shukla Cc: Fan Zhang , dpdk stable Subject: patch 'crypto/qat: fix build with GCC 12' has been queued to stable release 19.11.14 Date: Fri, 11 Nov 2022 12:38:33 +0100 Message-Id: <20221111113904.1549618-16-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/8367819585bc8c6c041e02a786db99fb01a75ecc Thanks. Christian Ehrhardt --- >From 8367819585bc8c6c041e02a786db99fb01a75ecc Mon Sep 17 00:00:00 2001 From: Amit Prakash Shukla Date: Thu, 4 Aug 2022 19:10:55 +0530 Subject: [PATCH] crypto/qat: fix build with GCC 12 [ upstream commit 04361fe2aca8998ea06fb4823dceb965698e147c ] GCC 12 raises the following warning: In function '_mm_storeu_si128', inlined from 'rte_mov16' at ../lib/eal/x86/include/rte_memcpy.h:508:2, inlined from 'rte_mov128' at ../lib/eal/x86/include/rte_memcpy.h:542: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 'qat_sym_do_precomputes.constprop' at ../drivers/crypto/qat/qat_sym_session.c:1434:2: /usr/lib/gcc/x86_64-pc-linux-gnu/12.1.1/include/emmintrin.h:739:8: error: array subscript 8 is outside array bounds of 'unsigned char[128]' [-Werror=array-bounds] 739 | *__P = __B; | ~~~~~^~~~~ ../drivers/crypto/qat/qat_sym_session.c: In function 'qat_sym_do_precomputes.constprop': ../drivers/crypto/qat/qat_sym_session.c:1305:17: note: at offset 192 into object 'opad.750' of size 128 1305 | uint8_t opad[qat_hash_get_block_size(ICP_QAT_HW_AUTH_ALGO_DELIMITER)]; | ^~~~ ../drivers/crypto/qat/qat_sym_session.c: In function 'qat_sym_do_precomputes.constprop': ../drivers/crypto/qat/qat_sym_session.c:1304:17: note: at offset 128 into object 'ipad.749' of size 128 1304 | uint8_t ipad[qat_hash_get_block_size(ICP_QAT_HW_AUTH_ALGO_DELIMITER)]; | ^~~~ Added a check to prevent compiler warnings. Fixes: 1703e94ac5ce ("qat: add driver for QuickAssist devices") Signed-off-by: Amit Prakash Shukla Acked-by: Fan Zhang --- drivers/crypto/qat/qat_sym_session.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c index 8c148c9cef..7c851de242 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -1383,6 +1383,10 @@ static int qat_sym_do_precomputes(enum icp_qat_hw_auth_algo hash_alg, QAT_LOG(ERR, "invalid keylen %u", auth_keylen); return -EFAULT; } + + RTE_VERIFY(auth_keylen <= sizeof(ipad)); + RTE_VERIFY(auth_keylen <= sizeof(opad)); + rte_memcpy(ipad, auth_key, auth_keylen); rte_memcpy(opad, auth_key, auth_keylen); -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 12:35:05.358470572 +0100 +++ 0016-crypto-qat-fix-build-with-GCC-12.patch 2022-11-11 12:35:04.745191908 +0100 @@ -1 +1 @@ -From 04361fe2aca8998ea06fb4823dceb965698e147c Mon Sep 17 00:00:00 2001 +From 8367819585bc8c6c041e02a786db99fb01a75ecc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 04361fe2aca8998ea06fb4823dceb965698e147c ] + @@ -44 +45,0 @@ -Cc: stable@dpdk.org @@ -53 +54 @@ -index e09d810354..52b3455cf0 100644 +index 8c148c9cef..7c851de242 100644 @@ -56 +57 @@ -@@ -1651,6 +1651,10 @@ static int qat_sym_do_precomputes(enum icp_qat_hw_auth_algo hash_alg, +@@ -1383,6 +1383,10 @@ static int qat_sym_do_precomputes(enum icp_qat_hw_auth_algo hash_alg,