From: Iuliana Prodan <iuliana.prodan@nxp.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
Horia Geanta <horia.geanta@nxp.com>,
Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: "David S. Miller" <davem@davemloft.net>,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-imx <linux-imx@nxp.com>
Subject: [PATCH 07/14] crypto: caam - check zero-length input
Date: Thu, 18 Jul 2019 17:45:17 +0300 [thread overview]
Message-ID: <1563461124-24641-8-git-send-email-iuliana.prodan@nxp.com> (raw)
In-Reply-To: <1563461124-24641-1-git-send-email-iuliana.prodan@nxp.com>
Check zero-length input, for skcipher algorithm, to solve the extra
tests. This is a valid operation, therefore the API will return no error.
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
---
drivers/crypto/caam/caamalg.c | 6 ++++++
drivers/crypto/caam/caamalg_qi.c | 3 +++
drivers/crypto/caam/caamalg_qi2.c | 5 +++++
3 files changed, 14 insertions(+)
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 6b9937c..9a7bb06 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -1891,6 +1891,9 @@ static int skcipher_encrypt(struct skcipher_request *req)
u32 *desc;
int ret = 0;
+ if (!req->cryptlen)
+ return 0;
+
/* allocate extended descriptor */
edesc = skcipher_edesc_alloc(req, DESC_JOB_IO_LEN * CAAM_CMD_SZ);
if (IS_ERR(edesc))
@@ -1925,6 +1928,9 @@ static int skcipher_decrypt(struct skcipher_request *req)
u32 *desc;
int ret = 0;
+ if (!req->cryptlen)
+ return 0;
+
/* allocate extended descriptor */
edesc = skcipher_edesc_alloc(req, DESC_JOB_IO_LEN * CAAM_CMD_SZ);
if (IS_ERR(edesc))
diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index 69cc657..b2dd4f3 100644
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -1450,6 +1450,9 @@ static inline int skcipher_crypt(struct skcipher_request *req, bool encrypt)
struct caam_ctx *ctx = crypto_skcipher_ctx(skcipher);
int ret;
+ if (!req->cryptlen)
+ return 0;
+
if (unlikely(caam_congested))
return -EAGAIN;
diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index da3452b..285e3c9 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -1499,6 +1499,9 @@ static int skcipher_encrypt(struct skcipher_request *req)
struct caam_request *caam_req = skcipher_request_ctx(req);
int ret;
+ if (!req->cryptlen)
+ return 0;
+
/* allocate extended descriptor */
edesc = skcipher_edesc_alloc(req);
if (IS_ERR(edesc))
@@ -1527,6 +1530,8 @@ static int skcipher_decrypt(struct skcipher_request *req)
struct caam_request *caam_req = skcipher_request_ctx(req);
int ret;
+ if (!req->cryptlen)
+ return 0;
/* allocate extended descriptor */
edesc = skcipher_edesc_alloc(req);
if (IS_ERR(edesc))
--
2.1.0
next prev parent reply other threads:[~2019-07-18 14:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 14:45 [PATCH 00/14] crypto: caam - fixes for kernel v5.3 Iuliana Prodan
2019-07-18 14:45 ` [PATCH 01/14] crypto: caam/qi - fix error handling in ERN handler Iuliana Prodan
2019-07-18 14:45 ` [PATCH 02/14] crypto: caam - fix return code in completion callbacks Iuliana Prodan
2019-07-18 14:45 ` [PATCH 03/14] crypto: caam - update IV only when crypto operation succeeds Iuliana Prodan
2019-07-18 14:59 ` Horia Geanta
2019-07-18 14:45 ` [PATCH 04/14] crypto: caam - check key length Iuliana Prodan
2019-07-18 14:45 ` [PATCH 05/14] crypto: caam - check authsize Iuliana Prodan
2019-07-18 14:45 ` [PATCH 06/14] crypto: caam - check assoclen Iuliana Prodan
2019-07-18 14:45 ` Iuliana Prodan [this message]
2019-07-18 14:45 ` [PATCH 08/14] crypto: caam - update rfc4106 sh desc to support zero length input Iuliana Prodan
2019-07-18 14:45 ` [PATCH 09/14] crypto: caam - keep both virtual and dma key addresses Iuliana Prodan
2019-07-18 14:45 ` [PATCH 10/14] crypto: caam - fix DKP for certain key lengths Iuliana Prodan
2019-07-18 14:45 ` [PATCH 11/14] crypto: caam - free resources in case caam_rng registration failed Iuliana Prodan
2019-07-18 14:45 ` [PATCH 12/14] crypto: caam - execute module exit point only if necessary Iuliana Prodan
2019-07-18 14:45 ` [PATCH 13/14] crypto: caam - unregister algorithm only if the registration succeeded Iuliana Prodan
2019-07-18 14:45 ` [PATCH 14/14] crypto: caam - change return value in case CAAM has no MDHA Iuliana Prodan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1563461124-24641-8-git-send-email-iuliana.prodan@nxp.com \
--to=iuliana.prodan@nxp.com \
--cc=aymen.sghaier@nxp.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=horia.geanta@nxp.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).