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 78EDEA0032 for ; Fri, 18 Feb 2022 13:45:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 734044114B; Fri, 18 Feb 2022 13:45:41 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id A086341142 for ; Fri, 18 Feb 2022 13:45:40 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id k3-20020a1ca103000000b0037bdea84f9cso6347173wme.1 for ; Fri, 18 Feb 2022 04:45:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oTs4ogCk2VbpFtr/O84bRQLgYU0r0gICVcefKW4YpM0=; b=fOlfxzbMIoES98/rN+KB5uinhN05+4Ts6BH1814RQDFzQbQO3QMtKBo/eTBGQ9CdLk Qy3W+/wDf/1BH+h/v0n5l9VWOwBG6nH0LhDLhef7g9Fbm98rxgHxbDgmMl9uBkwM9mED vRNlkeUY9s/7SemF9dQvsIAmPffG1++ZwJTmH2XVkjVCv4YA9qCuKN30ojagSHplN7OL NEZm+ZtV6xJ/geS6J1NHdSK6KjSBUPYYyuNhQKm+mOCDgXZ8Fbn/NNAPxxBFWXORTJiI +sv2BqIGoNdo2FzaKg0Ue3H560E3enqYcjTlNWXrFhXnr4rMPvODtdZM2jPWeeec14oN UkiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oTs4ogCk2VbpFtr/O84bRQLgYU0r0gICVcefKW4YpM0=; b=CHXQuVsOCCtVPGqOKfaGRk0hRVY7spL/jsVRpMxiw8j3rKCVMUXFBo+iQ2doh7vAbS 9jCehd5rzlymhLLHrNsqN/KbSw4UBnoBYA3MM8uKjhSHxneJvRA3VMsgzPBUaOdNMJOX 9BbpOR007K9lX8HKXZpRPCoNdg/ZVsMzGOg7d1oBlEwKtL/JuWZZ2lwR6N1lRauSIFrh nwGFS4KnaNj26JfkPi4ZnpfybNMpYPQtzhqxxhKpurZiY2KqIRQj/+QJ2EjIrzg89L+7 +5zJhBGpQORzFoISszY9I2aF+/RhUhLwCb5sLRjPCH0eBcyJrTAS6MfP1d0+RG2kMb9w sZ7w== X-Gm-Message-State: AOAM530skCBTJkKUbv7fYU/yakzvh0GrY20CN6WkCXnDQhiouIs9EiCq eyPKxok63DdoBW+sEGdP+is= X-Google-Smtp-Source: ABdhPJxaEd30kuu4ppIUZvEvfM2yTTMNQmhC1bLNa4Yf353HcsfY/55qSuPQRY9u6xk7FKVhOykBkA== X-Received: by 2002:a05:600c:2e47:b0:37b:9d9b:4c90 with SMTP id q7-20020a05600c2e4700b0037b9d9b4c90mr10360595wmf.69.1645188340345; Fri, 18 Feb 2022 04:45:40 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id z10sm4056448wmi.31.2022.02.18.04.45.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:45:39 -0800 (PST) From: luca.boccassi@gmail.com To: Hemant Agrawal Cc: dpdk stable Subject: patch 'crypto/dpaax_sec: fix auth/cipher xform chain checks' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:29 +0000 Message-Id: <20220218123931.1749595-120-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/cf9be042906ea3717203f1f07d7ba9aeac0f0a12 Thanks. Luca Boccassi --- >From cf9be042906ea3717203f1f07d7ba9aeac0f0a12 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Thu, 10 Feb 2022 16:28:50 +0530 Subject: [PATCH] crypto/dpaax_sec: fix auth/cipher xform chain checks [ upstream commit 99cc26f6652caa2c779fd169cadd62a1c365d52f ] This patch add more checks on next type for PDCP cases. Fixes: 45e019608f31 ("crypto/dpaa2_sec: support integrity only PDCP") Fixes: a1173d55598c ("crypto/dpaa_sec: support PDCP offload") Signed-off-by: Hemant Agrawal --- drivers/crypto/dpaa_sec/dpaa_sec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 94c3a4bbca..9179cccf83 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -2881,11 +2881,13 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev, /* find xfrm types */ if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) { cipher_xform = &xform->cipher; - if (xform->next != NULL) + if (xform->next != NULL && + xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) auth_xform = &xform->next->auth; } else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) { auth_xform = &xform->auth; - if (xform->next != NULL) + if (xform->next != NULL && + xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) cipher_xform = &xform->next->cipher; } else { DPAA_SEC_ERR("Invalid crypto type"); -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:42.327925990 +0000 +++ 0120-crypto-dpaax_sec-fix-auth-cipher-xform-chain-checks.patch 2022-02-18 12:37:37.882796208 +0000 @@ -1 +1 @@ -From 99cc26f6652caa2c779fd169cadd62a1c365d52f Mon Sep 17 00:00:00 2001 +From cf9be042906ea3717203f1f07d7ba9aeac0f0a12 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 99cc26f6652caa2c779fd169cadd62a1c365d52f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -14,3 +15,2 @@ - drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 ++++-- - drivers/crypto/dpaa_sec/dpaa_sec.c | 6 ++++-- - 2 files changed, 8 insertions(+), 4 deletions(-) + drivers/crypto/dpaa_sec/dpaa_sec.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) @@ -18,22 +17,0 @@ -diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c -index 444e1f0043..cb8aaf6446 100644 ---- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c -+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c -@@ -3231,13 +3231,15 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev *dev, - /* find xfrm types */ - if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) { - cipher_xform = &xform->cipher; -- if (xform->next != NULL) { -+ if (xform->next != NULL && -+ xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) { - session->ext_params.aead_ctxt.auth_cipher_text = true; - auth_xform = &xform->next->auth; - } - } else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) { - auth_xform = &xform->auth; -- if (xform->next != NULL) { -+ if (xform->next != NULL && -+ xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) { - session->ext_params.aead_ctxt.auth_cipher_text = false; - cipher_xform = &xform->next->cipher; - } @@ -41 +19 @@ -index 1137b142e9..75e437f696 100644 +index 94c3a4bbca..9179cccf83 100644 @@ -44 +22 @@ -@@ -2984,11 +2984,13 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev, +@@ -2881,11 +2881,13 @@ dpaa_sec_set_pdcp_session(struct rte_cryptodev *dev,