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 09061A034F for ; Tue, 1 Mar 2022 11:44:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 007E7407FF; Tue, 1 Mar 2022 11:44:08 +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 6377340DF6 for ; Tue, 1 Mar 2022 11:44:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131445; 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=Oy+vEPQz6ReGL/7LqFWRe57LYnnQGziKERvWeMk0rBg=; b=LRHNqEEzNRCdbYdu30N9mUtdseYLk1l7JLjqcHkd9/dEG0RwfdGOrg/YmGmMgfJKD1OMaX UjFKqSFDpfuFUzQ7DXWI0EKKRTB1tCZ/30pmYTXQKWJ5qBWBE3z0Iq7gyOiNTcSFRq4Lu4 ASGuChhd5/d9NAsXFmWMgl/MsR0xqBw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-503-VwZd6sLCN0yUfv3kb00f_w-1; Tue, 01 Mar 2022 05:44:02 -0500 X-MC-Unique: VwZd6sLCN0yUfv3kb00f_w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D055151E0; Tue, 1 Mar 2022 10:44:01 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12C05752BE; Tue, 1 Mar 2022 10:44:00 +0000 (UTC) From: Kevin Traynor To: Pablo de Lara Cc: dpdk stable Subject: patch 'crypto/ipsec_mb: check missing operation types' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:48 +0000 Message-Id: <20220301104300.334382-32-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/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/bbc596578afe0eba3cfb29792eae278800c4e661 Thanks. Kevin --- >From bbc596578afe0eba3cfb29792eae278800c4e661 Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Wed, 23 Feb 2022 16:01:13 +0000 Subject: [PATCH] crypto/ipsec_mb: check missing operation types [ upstream commit cfb566048ee729969d982a0c6020148d69f585fc ] When processing crypto operations in ZUC PMD, there were two operation types that were set at session level, but not checked when the operations are enqueued and processed, leaving the buffers untouched silently. Fixes: cde8df1bda9d ("crypto/ipsec_mb: move zuc PMD") Signed-off-by: Pablo de Lara --- drivers/crypto/ipsec_mb/pmd_zuc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/ipsec_mb/pmd_zuc.c b/drivers/crypto/ipsec_mb/pmd_zuc.c index 2eae1d1ec7..ec83d96dfc 100644 --- a/drivers/crypto/ipsec_mb/pmd_zuc.c +++ b/drivers/crypto/ipsec_mb/pmd_zuc.c @@ -199,5 +199,5 @@ process_ops(struct rte_crypto_op **ops, enum ipsec_mb_operation op_type, { unsigned int i; - unsigned int processed_ops; + unsigned int processed_ops = 0; switch (op_type) { @@ -213,4 +213,5 @@ process_ops(struct rte_crypto_op **ops, enum ipsec_mb_operation op_type, break; case IPSEC_MB_OP_ENCRYPT_THEN_HASH_GEN: + case IPSEC_MB_OP_DECRYPT_THEN_HASH_VERIFY: processed_ops = process_zuc_cipher_op(qp, ops, sessions, num_ops); @@ -218,4 +219,5 @@ process_ops(struct rte_crypto_op **ops, enum ipsec_mb_operation op_type, break; case IPSEC_MB_OP_HASH_VERIFY_THEN_DECRYPT: + case IPSEC_MB_OP_HASH_GEN_THEN_ENCRYPT: processed_ops = process_zuc_hash_op(qp, ops, sessions, num_ops); @@ -224,5 +226,6 @@ process_ops(struct rte_crypto_op **ops, enum ipsec_mb_operation op_type, default: /* Operation not supported. */ - processed_ops = 0; + for (i = 0; i < num_ops; i++) + ops[i]->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:02.213507766 +0000 +++ 0032-crypto-ipsec_mb-check-missing-operation-types.patch 2022-03-01 10:41:01.285244094 +0000 @@ -1 +1 @@ -From cfb566048ee729969d982a0c6020148d69f585fc Mon Sep 17 00:00:00 2001 +From bbc596578afe0eba3cfb29792eae278800c4e661 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cfb566048ee729969d982a0c6020148d69f585fc ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org