From b86a32234f67560068f8388077846ac35ca81f17 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 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") Cc: stable@dpdk.org 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 99eb0f71a8..476115323c 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