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 06D83A0543 for ; Sat, 5 Nov 2022 18:14:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0286C42D2E; Sat, 5 Nov 2022 18:14:27 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 7D3BB400D5 for ; Sat, 5 Nov 2022 18:14:25 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso4894289wmo.1 for ; Sat, 05 Nov 2022 10:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pPWtMHIP4i5IIm2r4g2AP5aoxidvtmb1OyNcw/NnVJY=; b=RPpumI4RppsGj/IVLuktdV14BKYrEmbsZV2nKBaaxrl19Quj9yTIlK0gY+jSR/u8Uc YOr+Cc6NKh4yW4AmPDRZ+dzBjqiwUhU7FzEnE/jGHdgqZCSkHSg+CJdHGDHdfy9EPikh zIUH8jHahaOuyncE3IPzPNAkMMdBy3KGNAA7Pl3hHfU0Of3ryNG0v20DDG9k54AdVDZM I9wTatIHWaY+hq5hcRgv+lkXuBRujqpbalkcxGyq6SVH9xxuVocl59OPZGLT69QI11MQ 9sWVZj4A4M11H2Z90OykdmW/ZMH4sWANz7DTISNyZCm0altPnxEsSwfStW7vad3L63jO NwLQ== 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=pPWtMHIP4i5IIm2r4g2AP5aoxidvtmb1OyNcw/NnVJY=; b=R56Uywfk6MSl/uG1Ey6aTAvKpW9OF0XIb8vHeWaJX2fIgTFPI41VANo//aQg2SO5NP t4D5B4BFF5GoxtuUA28kkEhJXJvz/LZo3lE4TApvEGDuey6YVAjAyIIGRyC8lXudJADo ceeq++ZgX0DAxaFqO+8osEyJWKY33d6DSP/ziQQIuyKDNuANAR3RrwQwdVOPm4qkMQUI fpvqfDHRk5K4ZPXTwA55Yva5YGZvDSpHNRdLzq1jHKoshIH64RSISpEZ/DuwEl7NxXkQ fItpRZbsxv2mhLqTlZY0jszT87obLzKNQO2FJfLmvNdBxKQjdgYy3ChLkd/xilL58iLP gMBg== X-Gm-Message-State: ACrzQf3pk2LpYvNsiASGv4D0N0HOrEjrqoASgWnHeSpwmDmgprKJzztN ycfMY9xumK83PfgmLqS47BW5UhpBUwArhw== X-Google-Smtp-Source: AMsMyM4GUfAVMqvEjtARrSs/j55S1TP9ic2eV06AHGlPNPR9K2qEdCfWlqe3ckKMFZzzjacXmu4vmA== X-Received: by 2002:a05:600c:2194:b0:3cf:7065:99e5 with SMTP id e20-20020a05600c219400b003cf706599e5mr22273133wme.174.1667668465260; Sat, 05 Nov 2022 10:14:25 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id i18-20020adfe492000000b002345cb2723esm2686137wrm.17.2022.11.05.10.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:14:24 -0700 (PDT) From: luca.boccassi@gmail.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 20.11.7 Date: Sat, 5 Nov 2022 17:11:46 +0000 Message-Id: <20221105171146.1520039-47-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.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 20.11.7 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/07/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/15c061fa8a0637c00e6516762849b8bde4046358 Thanks. Luca Boccassi --- >From 15c061fa8a0637c00e6516762849b8bde4046358 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 155d59d226..10db656316 100644 --- a/drivers/crypto/qat/qat_sym_session.c +++ b/drivers/crypto/qat/qat_sym_session.c @@ -1740,7 +1740,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); @@ -2004,10 +2009,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:12.860388736 +0000 +++ 0047-crypto-qat-fix-null-hash-algorithm-digest-size.patch 2022-11-05 17:11:08.862946678 +0000 @@ -1 +1 @@ -From 7283c59e37b114e692a379234a9d34f0d2c538e7 Mon Sep 17 00:00:00 2001 +From 15c061fa8a0637c00e6516762849b8bde4046358 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 155d59d226..10db656316 100644 @@ -22 +23 @@ -@@ -2052,7 +2052,12 @@ int qat_sym_cd_auth_set(struct qat_sym_session *cdesc, +@@ -1740,7 +1740,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, +@@ -2004,10 +2009,16 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,