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 E2133A0542 for ; Fri, 11 Nov 2022 11:35:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE0A642D11; Fri, 11 Nov 2022 11:35:20 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 206944014F for ; Fri, 11 Nov 2022 11:35:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n8MPT5u2NOQEYtoCM7qK8W4mO29qqcVxb4UpvMGjlm0=; b=C1b8N/u7sf05/v5Vhr/mgllwMs6VPKrEDyEy337SjsQMI32q74drjT4PPCI68W6p+4WKO/ 5ap1XfkfWQa1eGwdEoAr7vFomwNfT5xevux/5ymbT0HEn1JhQ2vYaE7whOJEB6QOeAnGGi wLNN8Gd8JWLpo7RoLeCSfgi1EBpmwug= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-593-J2tBICYhMMmG8xl_Wvt2Ug-1; Fri, 11 Nov 2022 05:35:16 -0500 X-MC-Unique: J2tBICYhMMmG8xl_Wvt2Ug-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9EAD33C01E08; Fri, 11 Nov 2022 10:35:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADAFE2022C2B; Fri, 11 Nov 2022 10:35:14 +0000 (UTC) From: Kevin Traynor To: Brian Dooley Cc: Ciara Power , dpdk stable Subject: patch 'crypto/qat: fix null hash algorithm digest size' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:33:36 +0000 Message-Id: <20221111103337.307408-46-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.3 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/14/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b7df2495f831f3b785812f54db7c20768d0bc0bb Thanks. Kevin --- >From b7df2495f831f3b785812f54db7c20768d0bc0bb 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 3697a038e5..f269e8992b 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -1819,5 +1819,10 @@ int qat_sym_cd_auth_set(struct qat_sym_session *cdesc, 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); @@ -2080,8 +2085,14 @@ int qat_sym_cd_auth_set(struct qat_sym_session *cdesc, 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; -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:18.150113896 +0000 +++ 0046-crypto-qat-fix-null-hash-algorithm-digest-size.patch 2022-11-11 10:32:17.131300998 +0000 @@ -1 +1 @@ -From 7283c59e37b114e692a379234a9d34f0d2c538e7 Mon Sep 17 00:00:00 2001 +From b7df2495f831f3b785812f54db7c20768d0bc0bb 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 3697a038e5..f269e8992b 100644 @@ -22 +23 @@ -@@ -2053,5 +2053,10 @@ int qat_sym_cd_auth_set(struct qat_sym_session *cdesc, +@@ -1819,5 +1819,10 @@ int qat_sym_cd_auth_set(struct qat_sym_session *cdesc, @@ -34 +35 @@ -@@ -2421,8 +2426,14 @@ int qat_sym_cd_auth_set(struct qat_sym_session *cdesc, +@@ -2080,8 +2085,14 @@ int qat_sym_cd_auth_set(struct qat_sym_session *cdesc,