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 6EBF3A0544 for ; Fri, 11 Nov 2022 12:41:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A5684014F; Fri, 11 Nov 2022 12:41:47 +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 1014840141 for ; Fri, 11 Nov 2022 12:41:46 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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 D070D3F0A2 for ; Fri, 11 Nov 2022 11:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668166905; bh=Xk1E9gXZGFJ17ZCs+PE0JePorH91BW3ToSD0WW/98i8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Jbo2WffHxdyVSRwUmQpRHP4KYFzjH6vMhlr/1mxUNeuPOgyO1hS+bPllP0Ko+2szG qobk5KHT9oazI86reoMOHJD0EzoDbf1TJO2tCzi8yKV4XiuU/2CjOQtC0aeErmuYuG o7eXz41wCK1bNhmvjfpQuLRo3qJY2FDIUyLzs6XpGhAcqJvz/HQtuJsKDUiezQD35H trRPaWJeOv498fVnK9vy4fhIe+1gA07jS92N0uUhvcd0Jv6JTxfoax9wtZCyHmijvY eOojKIHK52fpUZ8eFLGEyIyE7bPaRIhhVM8KV2x9nRcS3W9w95rRdX+ibQGiojVdF3 eJIuN4GzfAWXQ== Received: by mail-ed1-f71.google.com with SMTP id z9-20020a05640235c900b0046358415c4fso3441729edc.9 for ; Fri, 11 Nov 2022 03:41:45 -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=Xk1E9gXZGFJ17ZCs+PE0JePorH91BW3ToSD0WW/98i8=; b=q4bCtvaL0LS/OofPfNVpHW1zgICuXRak1v6kh8NcHCzG6uhvmUsaU7KKrEfTQ4Q1dg CaAbGjxJ+MUgkVN7NvwkOHgp4PuJcc6y6MMBCZ/eyRd/kK2BvHQ1DW4LwMCsP0gM6NnD PYvzfEJruvU2zlqpITHY+NeppWcXqqJpYmuq2AQxf8ssSsWCeMJhEp5t308KxyD9+bTg 7DVsPEjLkqQj1H5k4ry3q/mZSciZP0UYhzk95NVrB+Lm7WLWihVI1QMJvcZNQs1WZO1F JRZLvVR8B4jPe7wMFW41JDlluosFFHKTV6INIkJ/pSp5exfZph7ECfcQfWf5BzBWHDGM 4Ouw== X-Gm-Message-State: ANoB5plx3kTB1XzFENg73pr+91coQdo1pxnrdtvaG23HuPAuG8o/00K4 WO4TIAAt+ExLtVMtpKMTlnC0jV9o/SFevc671C+lDTEntlvwthesfUI1g6J4b5lECnSfbNCVjxS /MqkN2qqkJ/LIywHbdgXFlVxN X-Received: by 2002:a50:ef10:0:b0:461:ecca:e8a with SMTP id m16-20020a50ef10000000b00461ecca0e8amr1129440eds.139.1668166905593; Fri, 11 Nov 2022 03:41:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ZyGP/ZF0zo/85HWc9JqLS3d9if9ti3FCaeddJcL7pEP9MLirjni5R+Zsq77EkyOYYcQApTg== X-Received: by 2002:a50:ef10:0:b0:461:ecca:e8a with SMTP id m16-20020a50ef10000000b00461ecca0e8amr1129427eds.139.1668166905341; Fri, 11 Nov 2022 03:41:45 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39af:c100:1891:6c61:50fd:e567]) by smtp.gmail.com with ESMTPSA id u1-20020a1709064ac100b007305d408b3dsm793451ejt.78.2022.11.11.03.41.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:41:44 -0800 (PST) From: christian.ehrhardt@canonical.com To: Brian Dooley Cc: Ciara Power , dpdk stable Subject: patch 'crypto/qat: fix null hash algorithm digest size' has been queued to stable release 19.11.14 Date: Fri, 11 Nov 2022 12:39:04 +0100 Message-Id: <20221111113904.1549618-47-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/db57762c319a3f92972e2dac174fa20a77b526c9 Thanks. Christian Ehrhardt --- >From db57762c319a3f92972e2dac174fa20a77b526c9 Mon Sep 17 00:00:00 2001 From: Brian Dooley Date: Thu, 27 Oct 2022 10:50:14 +0000 Subject: [PATCH] crypto/qat: fix null hash algorithm digest size [ upstream commit 7283c59e37b114e692a379234a9d34f0d2c538e7 ] Add check for null hash algorithm digest size. Digest size should be 4B or request will be rejected. Fixes: 1703e94ac5ce ("qat: add driver for QuickAssist devices") Signed-off-by: Brian Dooley Acked-by: Ciara Power --- drivers/crypto/qat/qat_sym_session.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c index 7c851de242..d8ee2772de 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -1714,7 +1714,12 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, hash_offset = cdesc->cd_cur_ptr-((uint8_t *)&cdesc->cd); hash = (struct icp_qat_hw_auth_setup *)cdesc->cd_cur_ptr; hash->auth_config.reserved = 0; - hash->auth_config.config = + if (cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_NULL) + hash->auth_config.config = + ICP_QAT_HW_AUTH_CONFIG_BUILD(cdesc->auth_mode, + cdesc->qat_hash_alg, 4); + else + hash->auth_config.config = ICP_QAT_HW_AUTH_CONFIG_BUILD(cdesc->auth_mode, cdesc->qat_hash_alg, digestsize); @@ -1978,10 +1983,16 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, /* Auth CD config setup */ hash_cd_ctrl->hash_cfg_offset = hash_offset >> 3; hash_cd_ctrl->hash_flags = ICP_QAT_FW_AUTH_HDR_FLAG_NO_NESTED; - hash_cd_ctrl->inner_res_sz = digestsize; - hash_cd_ctrl->final_sz = digestsize; hash_cd_ctrl->inner_state1_sz = state1_size; - auth_param->auth_res_sz = digestsize; + if (cdesc->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_NULL) { + hash_cd_ctrl->inner_res_sz = 4; + hash_cd_ctrl->final_sz = 4; + auth_param->auth_res_sz = 4; + } else { + hash_cd_ctrl->inner_res_sz = digestsize; + hash_cd_ctrl->final_sz = digestsize; + auth_param->auth_res_sz = digestsize; + } hash_cd_ctrl->inner_state2_sz = state2_size; hash_cd_ctrl->inner_state2_offset = hash_cd_ctrl->hash_cfg_offset + -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 12:35:06.426221254 +0100 +++ 0047-crypto-qat-fix-null-hash-algorithm-digest-size.patch 2022-11-11 12:35:04.821192327 +0100 @@ -1 +1 @@ -From 7283c59e37b114e692a379234a9d34f0d2c538e7 Mon Sep 17 00:00:00 2001 +From db57762c319a3f92972e2dac174fa20a77b526c9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7283c59e37b114e692a379234a9d34f0d2c538e7 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 13a8d36e95..71fa595031 100644 +index 7c851de242..d8ee2772de 100644 @@ -22 +23 @@ -@@ -2052,7 +2052,12 @@ int qat_sym_cd_auth_set(struct qat_sym_session *cdesc, +@@ -1714,7 +1714,12 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc, @@ -36 +37 @@ -@@ -2420,10 +2425,16 @@ int qat_sym_cd_auth_set(struct qat_sym_session *cdesc, +@@ -1978,10 +1983,16 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,