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 E3F4EA0C41 for ; Tue, 30 Nov 2021 17:39:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D87A641186; Tue, 30 Nov 2021 17:39:43 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 5AAA54118F for ; Tue, 30 Nov 2021 17:39:42 +0100 (CET) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id CCCD13F1B1 for ; Tue, 30 Nov 2021 16:39:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290380; bh=82yHyUT5BmgOfT/T9Bmw0TJ5zOcTUKzJ0dqkkMnHTFo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N7+j5iI1NhiffDgkmUKm7fETU9IgSJ76b3vBCaUkHuX+0e7tCpeP2qdRryB1ePoeJ UuOv10cA6ij/de/goQR6X3DOFjmDGzNAcRWzoRxWW66OjWB1DFrMv9CSSngrzP8UQx F0sEFpaC78IlfTlXEEyWqjJPHfn2c2xQjVL25KESKtLV2ooIeFJOfFsd6AV2bcBtB9 HqlpeY8zpVGC3Ycm/pJuGYZnWNl9JXvN93a6RkF0KAzR87Ea3k3JonlHrlfqjNPVNA TRxXwV7ibKSAqMIFcj6oNGPhuj0i40/F3CparsSqxv204qCLnTSxuoTXXcm774NJtX 0Oa7Hrt+JLwpA== Received: by mail-ed1-f71.google.com with SMTP id t9-20020aa7d709000000b003e83403a5cbso17491246edq.19 for ; Tue, 30 Nov 2021 08:39:40 -0800 (PST) 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=82yHyUT5BmgOfT/T9Bmw0TJ5zOcTUKzJ0dqkkMnHTFo=; b=ntVFVfPDgmQOfQfdxF3Pnzgj5SdgFujAl6OVg50evUipJ6W/O8EoDQI/edH7LhgKzN KO31XHiaGFJvPLhR5Fi4PRpsKY3xhNJrQ/DgXadiiwIeqz/XXrVX6eummWR+uZJ/PiBy 0AFoSffnYR9oD6AbqcZQonloFCFcKf5cSXiXEzpSEb/A5ae6tJb3vPhu5JZLzgNN947e vP+NbKn61nXXROMCBO4lEjzFL0jULuaVDIwxofnpGuIEYZdFuLO4GeWFhxMkJW0YWnUi 8HZldoFzyxdei67XedoQUbc4gToxFY2DjxZg902S25UoXHR7I+txJLo4jY/scPgR1rJO pRmQ== X-Gm-Message-State: AOAM531ZGb98roLkixHKLj5VIUrRYiitDP4A+D3t/4fItxaPM5rO+rRP m+b2eOf3a7f1uBniAto1eDx3AQ/npiPMm0KcEK+bcu80y60w8lxsCWQwrCdznT9sSUqs+NdWw98 Z3+Yfx3UqTb5mXpSHMTVt+4E5 X-Received: by 2002:aa7:d288:: with SMTP id w8mr78801edq.404.1638290380123; Tue, 30 Nov 2021 08:39:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJx28eVvrrROTiFuL+4RHxMbRyog3I691T0DDrj5xOtpqXzaRR55ViCuMqzVfYK2QgigSGyF6w== X-Received: by 2002:aa7:d288:: with SMTP id w8mr78779edq.404.1638290379980; Tue, 30 Nov 2021 08:39:39 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id cs12sm9456701ejc.15.2021.11.30.08.39.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:39:39 -0800 (PST) From: christian.ehrhardt@canonical.com To: Przemyslaw Zegan Cc: Fan Zhang , dpdk stable Subject: patch 'app/crypto-perf: fix AAD template copy overrun' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:33 +0100 Message-Id: <20211130163605.2460997-69-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/037204dc83d55230af251beff23fd494c4c36ec9 Thanks. Christian Ehrhardt --- >From 037204dc83d55230af251beff23fd494c4c36ec9 Mon Sep 17 00:00:00 2001 From: Przemyslaw Zegan Date: Tue, 12 Oct 2021 12:56:11 +0000 Subject: [PATCH] app/crypto-perf: fix AAD template copy overrun [ upstream commit 49c19c94dc67a3db2f8534a1e6ca253e1f08fff7 ] This patch fixes a possible buffer overrun problem in crypto perf test. Previously when user configured AAD size is over 12 bytes the copy of template AAD will cause a buffer overrun. The problem is fixed by only copy up to 12 bytes of AAD template. Fixes: 8a5b494a7f99 ("app/test-crypto-perf: add AEAD parameters") Signed-off-by: Przemyslaw Zegan Acked-by: Fan Zhang --- app/test-crypto-perf/cperf_test_vectors.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/test-crypto-perf/cperf_test_vectors.c b/app/test-crypto-perf/cperf_test_vectors.c index 41641650c8..1bd46d848e 100644 --- a/app/test-crypto-perf/cperf_test_vectors.c +++ b/app/test-crypto-perf/cperf_test_vectors.c @@ -553,6 +553,10 @@ cperf_test_vector_get_dummy(struct cperf_options *options) rte_free(t_vec); return NULL; } + + if (options->aead_aad_sz > sizeof(aad)) + options->aead_aad_sz = sizeof(aad); + memcpy(t_vec->aad.data, aad, options->aead_aad_sz); t_vec->aad.phys_addr = rte_malloc_virt2iova(t_vec->aad.data); t_vec->aad.length = options->aead_aad_sz; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:09.957628046 +0100 +++ 0069-app-crypto-perf-fix-AAD-template-copy-overrun.patch 2021-11-30 16:50:05.742873178 +0100 @@ -1 +1 @@ -From 49c19c94dc67a3db2f8534a1e6ca253e1f08fff7 Mon Sep 17 00:00:00 2001 +From 037204dc83d55230af251beff23fd494c4c36ec9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 49c19c94dc67a3db2f8534a1e6ca253e1f08fff7 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 4bba405961..7da1a8fa2e 100644 +index 41641650c8..1bd46d848e 100644 @@ -24 +25 @@ -@@ -590,6 +590,10 @@ cperf_test_vector_get_dummy(struct cperf_options *options) +@@ -553,6 +553,10 @@ cperf_test_vector_get_dummy(struct cperf_options *options)