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 3C8AE46364 for ; Fri, 7 Mar 2025 13:49:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3815C40E34; Fri, 7 Mar 2025 13:49:02 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C807740E34 for ; Fri, 7 Mar 2025 13:49:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741351740; 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=Nb5KR2fSPBaTAkEkXMwqL135UxpOeXLE0ip+ZgXB7Ww=; b=bkUeo/8nLKqT+xo9utqPwakmFp4SH/k7HQkpOhuVrPyzCVa/WaTWcKsnwHzeomx8wcH1wK +b/9CAL7cz3up61mpblRCTBYgwHZkQRR09zknP7lngtLosdKsdTLQZab3v1e0wHKub/xDO dTU0nZBjSTJF6cu67TWItkSRP6GlwdQ= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-504-rxUEKz1oPzqujQcjmybHxg-1; Fri, 07 Mar 2025 07:48:59 -0500 X-MC-Unique: rxUEKz1oPzqujQcjmybHxg-1 X-Mimecast-MFC-AGG-ID: rxUEKz1oPzqujQcjmybHxg_1741351738 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4377D1801A00; Fri, 7 Mar 2025 12:48:58 +0000 (UTC) Received: from rh.Home (unknown [10.45.226.25]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0D7481956095; Fri, 7 Mar 2025 12:48:56 +0000 (UTC) From: Kevin Traynor To: Arkadiusz Kusztal Cc: dpdk stable Subject: patch 'test/crypto: fix check for OOP header data' has been queued to stable release 24.11.2 Date: Fri, 7 Mar 2025 12:47:11 +0000 Message-ID: <20250307124726.475001-38-ktraynor@redhat.com> In-Reply-To: <20250307124726.475001-1-ktraynor@redhat.com> References: <20250307124726.475001-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QxUj04qntnGYmqT5H3vOwHRFG6b9ZhDWx1lLZ7ITTaY_1741351738 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 24.11.2 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/12/25. 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/e87cadfd7e3cf327dde616a28d0e534a71db94b5 Thanks. Kevin --- >From e87cadfd7e3cf327dde616a28d0e534a71db94b5 Mon Sep 17 00:00:00 2001 From: Arkadiusz Kusztal Date: Wed, 26 Feb 2025 08:16:45 +0000 Subject: [PATCH] test/crypto: fix check for OOP header data [ upstream commit 27eb74ea6e25966d3857539cb15ddd4f20f05ebe ] The data of the out-of-place header is never checked. Therefore, the faulty PMD, which overwrites this data, will not be able to verify that with tests. New checks to support that were added to the GCM OOP functions. Fixes: 51e202f0596f ("test/crypto: rename GCM test code") Signed-off-by: Arkadiusz Kusztal --- app/test/test_cryptodev.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index a33ef574cc..d76cdf26d7 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -13768,6 +13768,7 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata) struct crypto_unittest_params *ut_params = &unittest_params; + uint32_t i; int retval; - uint8_t *ciphertext, *auth_tag; + uint8_t *ciphertext, *auth_tag, *buffer_oop; uint16_t plaintext_pad_len; struct rte_cryptodev_info dev_info; @@ -13845,4 +13846,16 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata) auth_tag = ciphertext + plaintext_pad_len; + /* Check if the data within the offset range is not overwritten in the OOP */ + buffer_oop = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *); + for (i = 0; i < ut_params->op->sym->cipher.data.offset; i++) { + if (buffer_oop[i]) { + RTE_LOG(ERR, USER1, + "Incorrect value of the output buffer header\n"); + debug_hexdump(stdout, "Incorrect value:", buffer_oop, + ut_params->op->sym->cipher.data.offset); + return TEST_FAILED; + } + } + debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len); debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len); @@ -13877,6 +13890,7 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata) struct crypto_unittest_params *ut_params = &unittest_params; + uint32_t i; int retval; - uint8_t *plaintext; + uint8_t *plaintext, *buffer_oop; struct rte_cryptodev_info dev_info; @@ -13956,4 +13970,15 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata) debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len); + /* Check if the data within the offset range is not overwritten in the OOP */ + buffer_oop = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *); + for (i = 0; i < ut_params->op->sym->cipher.data.offset; i++) { + if (buffer_oop[i]) { + RTE_LOG(ERR, USER1, + "Incorrect value of the output buffer header\n"); + debug_hexdump(stdout, "Incorrect value:", buffer_oop, + ut_params->op->sym->cipher.data.offset); + return TEST_FAILED; + } + } /* Validate obuf */ TEST_ASSERT_BUFFERS_ARE_EQUAL( -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-03-07 11:02:58.290057148 +0000 +++ 0038-test-crypto-fix-check-for-OOP-header-data.patch 2025-03-07 11:02:56.919335910 +0000 @@ -1 +1 @@ -From 27eb74ea6e25966d3857539cb15ddd4f20f05ebe Mon Sep 17 00:00:00 2001 +From e87cadfd7e3cf327dde616a28d0e534a71db94b5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 27eb74ea6e25966d3857539cb15ddd4f20f05ebe ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 2e58819fca..bbab034c5f 100644 +index a33ef574cc..d76cdf26d7 100644 @@ -23 +24 @@ -@@ -13799,6 +13799,7 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata) +@@ -13768,6 +13768,7 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata) @@ -32 +33 @@ -@@ -13876,4 +13877,16 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata) +@@ -13845,4 +13846,16 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata) @@ -49 +50 @@ -@@ -13908,6 +13921,7 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata) +@@ -13877,6 +13890,7 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata) @@ -58 +59 @@ -@@ -13987,4 +14001,15 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata) +@@ -13956,4 +13970,15 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata)