From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 84652A04DD for ; Wed, 28 Oct 2020 11:54:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7DF86CA34; Wed, 28 Oct 2020 11:54:20 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by dpdk.org (Postfix) with ESMTP id ACCA9CA34 for ; Wed, 28 Oct 2020 11:54:17 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id t9so5132521wrq.11 for ; Wed, 28 Oct 2020 03:54:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TK7IwCWSjobygpZQicM0iF/V6FTyxxEwDH9Cm7pwbIw=; b=PJKGeWQEljQ0s1pai5NNAiJaDurhiii+H3t5gL85b37aLCope2lnLzezXPPVIwEKzK wevJeXnKyr6iiRuQ9UVbYdFKCNTHx447zCyEYjVMOF8duoAUc0xEloxgNTCDnaGKvbhQ AknC8Z2l8eULIuzZbJlCZpnLPVenCcOQg3qsb/5DaQIflrz9DT+52zw74+BMGM++D577 GBg+qd8KSkG7+E5Ye/NpkH0VVU8OpMLqFoVmL3vlPxGMIqDJW0wYgdOlP168WFfLzGL9 bolggVIg0fw/wNDX+H2c3VktmppjOPUGwFZZ6A3zzm5n6cGeNIyaix6FTZY2Yt0a0lTK vmMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TK7IwCWSjobygpZQicM0iF/V6FTyxxEwDH9Cm7pwbIw=; b=BP+82q58AESh/c/JporC2PspgLgKIKP1IriZt5FJjxPGimfmJGaehLAIywZVm7P1FZ XB+uVVZ2bs2EbaM1LcyfNVo/oini1yufIXZye813WG6JbykNokvMEDNlLNEVhJgn/D2+ JEBXtfgjNEm3W9BefsXaK1mykMWJBR1xoQ82sPd3JScDuZzZ23WGd55xcDhwXeaEhZE6 Gnfl3PPzqe2SDg1emViYA69lYwUL7XvmUNi71y6bUjejM+iHRpOhS4X+1990oQmK4Lk5 /6SX1KBM4tdjvSc6Nfi9wty4A/mG9a80uB7l2uxZsIl6P3kXD4e1QRWbb/EPSmtEhF8A zi/A== X-Gm-Message-State: AOAM532Kh5+sX07DqSCbq44VRtqog3Kg1/48OWXgRA7mMA15e0nCBYGf ojhBHChtxU9dXzh8iLNJ/LxBlj+xUQG8xZ3O X-Google-Smtp-Source: ABdhPJxP4jwq9Oi8d8QYK1bsp7ImMzbo0daesftDN9p4qrZwTwFVf6PTZwI1UapF5xi98PMlfZI+Iw== X-Received: by 2002:adf:a354:: with SMTP id d20mr8682281wrb.29.1603882456438; Wed, 28 Oct 2020 03:54:16 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u195sm6600254wmu.18.2020.10.28.03.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:54:15 -0700 (PDT) From: luca.boccassi@gmail.com To: Pablo de Lara Cc: dpdk stable Date: Wed, 28 Oct 2020 10:45:12 +0000 Message-Id: <20201028104606.3504127-153-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/aesni_mb: fix CCM digest size check' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. 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. Thanks. Luca Boccassi --- >From 33e87f16a377adee2907103cef178f6eb5674911 Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Fri, 9 Oct 2020 12:05:19 +0000 Subject: [PATCH] crypto/aesni_mb: fix CCM digest size check [ upstream commit 07bfb9047ba12f169e09606be72e821facbf88c2 ] Digest size for CCM was being checked for other algorithms apart from CCM. Fixes: c4c0c312a823 ("crypto/aesni_mb: check for invalid digest size") Signed-off-by: Pablo de Lara --- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index 40feae3c62..8850934f1f 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -537,6 +537,14 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr, return -EINVAL; } + /* Set IV parameters */ + sess->iv.offset = xform->aead.iv.offset; + sess->iv.length = xform->aead.iv.length; + + /* Set digest sizes */ + sess->auth.req_digest_len = xform->aead.digest_length; + sess->auth.gen_digest_len = sess->auth.req_digest_len; + switch (xform->aead.algo) { case RTE_CRYPTO_AEAD_AES_CCM: sess->cipher.mode = CCM; @@ -555,6 +563,13 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr, return -EINVAL; } + /* CCM digests must be between 4 and 16 and an even number */ + if (sess->auth.req_digest_len < AES_CCM_DIGEST_MIN_LEN || + sess->auth.req_digest_len > AES_CCM_DIGEST_MAX_LEN || + (sess->auth.req_digest_len & 1) == 1) { + AESNI_MB_LOG(ERR, "Invalid digest size\n"); + return -EINVAL; + } break; case RTE_CRYPTO_AEAD_AES_GCM: @@ -589,20 +604,6 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr, return -ENOTSUP; } - /* Set IV parameters */ - sess->iv.offset = xform->aead.iv.offset; - sess->iv.length = xform->aead.iv.length; - - sess->auth.req_digest_len = xform->aead.digest_length; - /* CCM digests must be between 4 and 16 and an even number */ - if (sess->auth.req_digest_len < AES_CCM_DIGEST_MIN_LEN || - sess->auth.req_digest_len > AES_CCM_DIGEST_MAX_LEN || - (sess->auth.req_digest_len & 1) == 1) { - AESNI_MB_LOG(ERR, "Invalid digest size\n"); - return -EINVAL; - } - sess->auth.gen_digest_len = sess->auth.req_digest_len; - return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:16.488872615 +0000 +++ 0153-crypto-aesni_mb-fix-CCM-digest-size-check.patch 2020-10-28 10:35:11.748833616 +0000 @@ -1,13 +1,14 @@ -From 07bfb9047ba12f169e09606be72e821facbf88c2 Mon Sep 17 00:00:00 2001 +From 33e87f16a377adee2907103cef178f6eb5674911 Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Fri, 9 Oct 2020 12:05:19 +0000 Subject: [PATCH] crypto/aesni_mb: fix CCM digest size check +[ upstream commit 07bfb9047ba12f169e09606be72e821facbf88c2 ] + Digest size for CCM was being checked for other algorithms apart from CCM. Fixes: c4c0c312a823 ("crypto/aesni_mb: check for invalid digest size") -Cc: stable@dpdk.org Signed-off-by: Pablo de Lara --- @@ -15,10 +16,10 @@ 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c -index 34a39ca992..ba2882d276 100644 +index 40feae3c62..8850934f1f 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c -@@ -661,6 +661,14 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr, +@@ -537,6 +537,14 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr, return -EINVAL; } @@ -33,7 +34,7 @@ switch (xform->aead.algo) { case RTE_CRYPTO_AEAD_AES_CCM: sess->cipher.mode = CCM; -@@ -679,6 +687,13 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr, +@@ -555,6 +563,13 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr, return -EINVAL; } @@ -47,7 +48,7 @@ break; case RTE_CRYPTO_AEAD_AES_GCM: -@@ -713,20 +728,6 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr, +@@ -589,20 +604,6 @@ aesni_mb_set_session_aead_parameters(const MB_MGR *mb_mgr, return -ENOTSUP; }