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 85E7E43CE7 for ; Mon, 18 Mar 2024 16:39:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C0C74064C; Mon, 18 Mar 2024 16:39:35 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id B6CEA4027F for ; Mon, 18 Mar 2024 16:39:33 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-33d90dfe73cso2547599f8f.0 for ; Mon, 18 Mar 2024 08:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710776373; x=1711381173; darn=dpdk.org; 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=tEJuY9c+TCFz6jsXFomfZrNXASIFrOmpSjXsM0M8mHA=; b=IC1wmxbeKeSSgBWM3zF5r+Vhg2lStd6/nKXvLJVdMoGnuvbsLwXsZswfmHctHQVGKS tqIx8r94IjE03LfSBt3cGVEObZbiD0gqUPrT9Wzg6VRMXnArn9HmUhptByAP8pVUG7F3 efyyl5/4YpKgwdmNCLV2Eur6Odm3vZs+/cQ0E+4uv1zdRh+XlJY9ITD1hzyqCcHP/Mr9 lefcP/Cgmvw8NoXZEeXRqw8bPEJ5geY9Pm8e0nYtaLVRgqQL8PThLMWg8UsqwxSSnyE1 XjaJmjypda22e8f0xEy9O1qHp4zpFOxAZmgnGepdD8bIGvuRCEmM+lcysIETUJXb/lP6 J3gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710776373; x=1711381173; 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=tEJuY9c+TCFz6jsXFomfZrNXASIFrOmpSjXsM0M8mHA=; b=pbnpG2c0peY0u5hRF5KECntCH8SRAEjHKqlucF2UZK5tAWQUn1a1Oc4ITiSsqXy3ln WK4Kby2VxAXnFin10Kbt5yPj2dtUYFWF91Nqz4hfdKqm3miLb6dq+6w0UmpFrQ3I/zuk mD2m6BbHLDDKY6K473tHRRhnUuoQYpjfnDiBSOxswmrZieBd6QUcEEMELs4JF0UWroqt jq+P8+JCOXeO4qMJWVbe7XikCrvWWJAQcvvIDs2f0l9ALfsIsr9QsWQKlQH+UKJW45sk 75CpdHA57iaAlZAePv8tWvY34zUtLltnElCh0i6trGzNFoSd8LRF7FBdiRtSxasTIy6r afog== X-Forwarded-Encrypted: i=1; AJvYcCVcmaBDKXcKKy4XlqqckSxIj0qBo3MCB5foUaCo3EgzhrsQrwy3o5LkNgqCOybHSBoZr35ktnM/SPoKy3HPE7I= X-Gm-Message-State: AOJu0YwsCdZ0Ke2fDoamveVqOGm39KuHOvuQKTORrb4iIz7NWVS1fKT1 uFajWyTuZs43gguTRrfg/NWrRfaZ3R2OpiLN0QMJLpcmenUa5pGcarXD6ay2/18= X-Google-Smtp-Source: AGHT+IFRDF0hllOK6Q+p4MlaL0MJs2MQe+R49yVyikND+qPSOLi+370WkSdBu+FJQ4L6H05zyRuANg== X-Received: by 2002:adf:eccd:0:b0:33e:9e27:fab with SMTP id s13-20020adfeccd000000b0033e9e270fabmr10809089wro.12.1710776373390; Mon, 18 Mar 2024 08:39:33 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id l15-20020a5d410f000000b0033cf4e47496sm10016023wrp.51.2024.03.18.08.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 08:39:32 -0700 (PDT) From: luca.boccassi@gmail.com To: Arkadiusz Kusztal Cc: Ciara Power , dpdk stable Subject: patch 'crypto/qat: fix crash with CCM null AAD pointer' has been queued to stable release 22.11.5 Date: Mon, 18 Mar 2024 15:38:53 +0000 Message-Id: <20240318153919.3407921-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318153919.3407921-1-luca.boccassi@gmail.com> References: <20240314000957.2810803-61-luca.boccassi@gmail.com> <20240318153919.3407921-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 22.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 03/20/24. 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/a56f1654c4c4d00f7df77f61733f59c840b5c090 Thanks. Luca Boccassi --- >From a56f1654c4c4d00f7df77f61733f59c840b5c090 Mon Sep 17 00:00:00 2001 From: Arkadiusz Kusztal Date: Fri, 8 Mar 2024 08:25:12 +0000 Subject: [PATCH] crypto/qat: fix crash with CCM null AAD pointer [ upstream commit e90ef1803bb34768d1446e756046020e8cbce4bc ] This commit fixes a segfault, that occurs when NULL pointer is being set to the AAD pointer field. Fixes: a815a04cea05 ("crypto/qat: support symmetric build op request") Signed-off-by: Arkadiusz Kusztal Acked-by: Ciara Power --- drivers/crypto/qat/dev/qat_crypto_pmd_gens.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h index 7972c7cfeb..2b1b0eb717 100644 --- a/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h +++ b/drivers/crypto/qat/dev/qat_crypto_pmd_gens.h @@ -812,10 +812,12 @@ enqueue_one_aead_job_gen1(struct qat_sym_session *ctx, *(uint8_t *)&cipher_param->u.cipher_IV_array[0] = q - ICP_QAT_HW_CCM_NONCE_OFFSET; - rte_memcpy((uint8_t *)aad->va + - ICP_QAT_HW_CCM_NONCE_OFFSET, - (uint8_t *)iv->va + ICP_QAT_HW_CCM_NONCE_OFFSET, - ctx->cipher_iv.length); + if (ctx->aad_len > 0) { + rte_memcpy((uint8_t *)aad->va + + ICP_QAT_HW_CCM_NONCE_OFFSET, + (uint8_t *)iv->va + ICP_QAT_HW_CCM_NONCE_OFFSET, + ctx->cipher_iv.length); + } break; default: break; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-18 12:58:39.398261243 +0000 +++ 0003-crypto-qat-fix-crash-with-CCM-null-AAD-pointer.patch 2024-03-18 12:58:39.091344117 +0000 @@ -1 +1 @@ -From e90ef1803bb34768d1446e756046020e8cbce4bc Mon Sep 17 00:00:00 2001 +From a56f1654c4c4d00f7df77f61733f59c840b5c090 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e90ef1803bb34768d1446e756046020e8cbce4bc ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 60b0f0551c..1f5d2583c4 100644 +index 7972c7cfeb..2b1b0eb717 100644 @@ -22 +23 @@ -@@ -925,10 +925,12 @@ enqueue_one_aead_job_gen1(struct qat_sym_session *ctx, +@@ -812,10 +812,12 @@ enqueue_one_aead_job_gen1(struct qat_sym_session *ctx,