[dpdk-dev] kasumi: restrict cipher bit-level ops

Message ID 1468082158-94564-1-git-send-email-pablo.de.lara.guarch@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

De Lara Guarch, Pablo July 9, 2016, 4:35 p.m. UTC
  KASUMI PMD only supports bit-level cipher operations
when destination buffer is different from the source
(out of place operations). This commit adds a check
in the code to prevent the user from trying to perform
in-place bit-level ciphering.

Fixes: 2773c86d061a ("crypto/kasumi: add driver for KASUMI library")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 doc/guides/cryptodevs/kasumi.rst       | 3 +++
 drivers/crypto/kasumi/rte_kasumi_pmd.c | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
  

Comments

Thomas Monjalon July 10, 2016, 12:41 p.m. UTC | #1
2016-07-09 17:35, Pablo de Lara:
> KASUMI PMD only supports bit-level cipher operations
> when destination buffer is different from the source
> (out of place operations). This commit adds a check
> in the code to prevent the user from trying to perform
> in-place bit-level ciphering.
> 
> Fixes: 2773c86d061a ("crypto/kasumi: add driver for KASUMI library")
> 
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Applied, thanks
  

Patch

diff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst
index d6b3a97..7346b21 100644
--- a/doc/guides/cryptodevs/kasumi.rst
+++ b/doc/guides/cryptodevs/kasumi.rst
@@ -52,6 +52,9 @@  Limitations
 
 * Chained mbufs are not supported.
 * KASUMI(F9) supported only if hash offset field is byte-aligned.
+* In-place bit-level operations for KASUMI(F8) are not supported
+  (if length and/or offset of data to be ciphered is not byte-aligned).
+
 
 Installation
 ------------
diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c
index 1cdbc06..4e21743 100644
--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c
@@ -243,9 +243,12 @@  process_kasumi_cipher_op_bit(struct rte_crypto_op *op,
 
 	offset_in_bits = op->sym->cipher.data.offset;
 	src = rte_pktmbuf_mtod(op->sym->m_src, uint8_t *);
-	dst = op->sym->m_dst ?
-		rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *) :
-		rte_pktmbuf_mtod(op->sym->m_src, uint8_t *);
+	if (op->sym->m_dst == NULL) {
+		op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+		KASUMI_LOG_ERR("bit-level in-place not supported\n");
+		return 0;
+	}
+	dst = rte_pktmbuf_mtod(op->sym->m_dst, uint8_t *);
 	IV = *((uint64_t *)(op->sym->cipher.iv.data));
 	length_in_bits = op->sym->cipher.data.length;