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 57AD9A0518 for ; Fri, 24 Jul 2020 14:07:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 513BD1BFE7; Fri, 24 Jul 2020 14:07:16 +0200 (CEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by dpdk.org (Postfix) with ESMTP id C8BAE1C135 for ; Fri, 24 Jul 2020 14:07:15 +0200 (CEST) Received: by mail-wm1-f47.google.com with SMTP id k20so399560wmi.5 for ; Fri, 24 Jul 2020 05:07:15 -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=djkPSuPh96owDmgfkQjlnuc9fwGJtVXEyRE+ApC60B4=; b=GdVwi210E6Ls9vBSNvf1JHoa3qimh0yv09zAH4P63234QmYIkhAw5kduU3tbqoquYC TZsycGJgrdAOc1SqaTeu0x1pyQT8o+f8BE3Iiqa/ijT+ZXe3rjxhjAAc6OdJkRlw/bgF SFsB7y7QkgmnjiHIC3uCb05O4+LPF1wfQTH84Tl9ZZERPfJzfUHzRO3Meo9KBvds5JAA RwpX8PaWR7098Wtm17MvFCgxo5xRjytv8YDtIr/314hYLABX4HYpHValf6IPF4Fkms4P S4mZVWDoBA7NI/aYwXK7An0F8AQRLFlS4qF8pe95h9FjEYufxIalLWvoP9xdZdi517Db TLPg== 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=djkPSuPh96owDmgfkQjlnuc9fwGJtVXEyRE+ApC60B4=; b=RZcoGyjDXLxtTOe/OImaBEV+mNepuh5crvQgQd8XvYNgtManyG4z8q6C/AzbePYbgl Nz0YtWIeby2BYb6zy7tJuoSOcOVS/FuUyDmymIahenQXaszqzIqBMf311YcxRpeq6LEo ivTneFPz+f4rk01QI7tBmuFQtpVyij/6XvPZPpVen9P37PQzFY7mLroPdeYBHVYvtC7p GzwGZ5g0UvgX4oRegncgwS+sy+IHIeinTn6890REdiCLqcKYWsq4s1uh9Iafzt6AkkUM nLOryiLMPvl7pxpFgFfuVmZZdaNLusr9oG42XVukZBCqqKF8bQ717jZ2WtzG6KwT9L+P fDWQ== X-Gm-Message-State: AOAM532ckL2uHqTy9h1zMLpYs3/xox+6ZrXck/cC/L9oY7aSoV1sP7kg pVDtt2zEBpfVkiCw1UV+xvs= X-Google-Smtp-Source: ABdhPJxoHSkIXKIDb/e0LOTLZskdVvrPOK+RGGDuQO/iraLQ1IBWmigT6cQy8g8UxShePRbLOCF9+A== X-Received: by 2002:a7b:c755:: with SMTP id w21mr8293217wmk.26.1595592435511; Fri, 24 Jul 2020 05:07:15 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 78sm7282654wma.31.2020.07.24.05.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:07:14 -0700 (PDT) From: luca.boccassi@gmail.com To: Akhil Goyal Cc: Hemant Agrawal , dpdk stable Date: Fri, 24 Jul 2020 12:58:57 +0100 Message-Id: <20200724120030.1863487-99-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/dpaax: fix 12-bit null auth case' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 8d4e11926d3afc849a98ea2416c7c5d3ed570083 Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Wed, 8 Jan 2020 18:22:31 +0530 Subject: [PATCH] common/dpaax: fix 12-bit null auth case [ upstream commit b86a32234f67560068f8388077846ac35ca81f17 ] In cases of NULL auth in PDCP, the descriptors should be based on ALGORITHM command instead of PROTOCOL command. It was done in case of encap, but was missing in decap. Fixes: 526cdf60f1e5 ("crypto/dpaa2_sec: update desc for PDCP 18-bit enc-auth") Signed-off-by: Akhil Goyal Acked-by: Hemant Agrawal --- drivers/common/dpaax/caamflib/desc/pdcp.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 99eb0f71a..476115323 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+ * Copyright 2008-2013 Freescale Semiconductor, Inc. - * Copyright 2019 NXP + * Copyright 2019-2020 NXP */ #ifndef __DESC_PDCP_H__ @@ -3528,6 +3528,15 @@ cnstr_shdsc_pdcp_u_plane_decap(uint32_t *descbuf, KEY(p, KEY2, authdata->key_enc_flags, (uint64_t)authdata->key, authdata->keylen, INLINE_KEY(authdata)); + else if (authdata && authdata->algtype == 0) { + err = pdcp_insert_uplane_with_int_op(p, swap, + cipherdata, authdata, + sn_size, era_2_sw_hfn_ovrd, + OP_TYPE_DECAP_PROTOCOL); + if (err) + return err; + break; + } /* Insert Cipher Key */ KEY(p, KEY1, cipherdata->key_enc_flags, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:52.369976559 +0100 +++ 0099-common-dpaax-fix-12-bit-null-auth-case.patch 2020-07-24 12:53:48.343007503 +0100 @@ -1,8 +1,10 @@ -From b86a32234f67560068f8388077846ac35ca81f17 Mon Sep 17 00:00:00 2001 +From 8d4e11926d3afc849a98ea2416c7c5d3ed570083 Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Wed, 8 Jan 2020 18:22:31 +0530 Subject: [PATCH] common/dpaax: fix 12-bit null auth case +[ upstream commit b86a32234f67560068f8388077846ac35ca81f17 ] + In cases of NULL auth in PDCP, the descriptors should be based on ALGORITHM command instead of PROTOCOL command. @@ -10,7 +12,6 @@ decap. Fixes: 526cdf60f1e5 ("crypto/dpaa2_sec: update desc for PDCP 18-bit enc-auth") -Cc: stable@dpdk.org Signed-off-by: Akhil Goyal Acked-by: Hemant Agrawal