crypto: caam - update IV only when crypto operation succeeds

skcipher encryption might fail and in some cases, like (invalid) input
length smaller then block size, updating the IV would lead to a useless
IV copy in case hardware issued an error.

Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 06b4f2d47be4ef7766c5e0ac920f684697192979..28d55a05b0f3679779a830f1d4ec1cda55a5252e 100644 (file)
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -990,10 +990,9 @@ static void skcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err,
         * ciphertext block (CBC mode) or last counter (CTR mode).
         * This is used e.g. by the CTS mode.
         */
-       if (ivsize) {
+       if (ivsize && !ecode) {
                memcpy(req->iv, (u8 *)edesc->sec4_sg + edesc->sec4_sg_bytes,
                       ivsize);
-
                print_hex_dump_debug("dstiv  @"__stringify(__LINE__)": ",
                                     DUMP_PREFIX_ADDRESS, 16, 4, req->iv,
                                     edesc->src_nents > 1 ? 100 : ivsize, 1);
@@ -1030,7 +1029,7 @@ static void skcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err,
         * ciphertext block (CBC mode) or last counter (CTR mode).
         * This is used e.g. by the CTS mode.
         */
-       if (ivsize) {
+       if (ivsize && !ecode) {
                memcpy(req->iv, (u8 *)edesc->sec4_sg + edesc->sec4_sg_bytes,
                       ivsize);
 

diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index ab263b1bf7f1c5abeb62c8acec12bbd19e2d7a85..66531d6fbd0bea631689a83e4608bced62819ec3 100644 (file)
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -1201,7 +1201,9 @@ static void skcipher_done(struct caam_drv_req *drv_req, u32 status)
         * ciphertext block (CBC mode) or last counter (CTR mode).
         * This is used e.g. by the CTS mode.
         */
-       memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes, ivsize);
+       if (!ecode)
+               memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes,
+                      ivsize);
 
        qi_cache_free(edesc);
        skcipher_request_complete(req, ecode);

diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index 008528b563ead399902f68df832d4e2a48b6a146..fcd8a488efc5110c934cf46a8ee90929c5853eb2 100644 (file)
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -1359,7 +1359,9 @@ static void skcipher_encrypt_done(void *cbk_ctx, u32 status)
         * ciphertext block (CBC mode) or last counter (CTR mode).
         * This is used e.g. by the CTS mode.
         */
-       memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes, ivsize);
+       if (!ecode)
+               memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes,
+                      ivsize);
 
        qi_cache_free(edesc);
        skcipher_request_complete(req, ecode);
@@ -1395,7 +1397,9 @@ static void skcipher_decrypt_done(void *cbk_ctx, u32 status)
         * ciphertext block (CBC mode) or last counter (CTR mode).
         * This is used e.g. by the CTS mode.
         */
-       memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes, ivsize);
+       if (!ecode)
+               memcpy(req->iv, (u8 *)&edesc->sgt[0] + edesc->qm_sg_bytes,
+                      ivsize);
 
        qi_cache_free(edesc);
        skcipher_request_complete(req, ecode);