crypto: atmel-{aes,tdes} - Update the IV only when the op succeeds

Do not update the IV in case of errors.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c
index 855f0ccc936836bcc0a0a854f0ec2cb01c0cd856..245d45f93b61773b8692bfff96b9718ca55986cd 100644 (file)
--- a/drivers/crypto/atmel-aes.c
+++ b/drivers/crypto/atmel-aes.c
@@ -546,7 +546,7 @@ static inline int atmel_aes_complete(struct atmel_aes_dev *dd, int err)
        clk_disable(dd->iclk);
        dd->flags &= ~AES_FLAGS_BUSY;
 
-       if (!dd->ctx->is_aead &&
+       if (!err && !dd->ctx->is_aead &&
            (rctx->mode & AES_FLAGS_OPMODE_MASK) != AES_FLAGS_ECB) {
                if ((rctx->mode & AES_FLAGS_OPMODE_MASK) != AES_FLAGS_CTR)
                        atmel_aes_set_iv_as_last_ciphertext_block(dd);

diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c
index 83a6d42c892186f25d8cff62580776c591594b80..e7cd7b01b93155dad95aa707a3fbb32db752b6e9 100644 (file)
--- a/drivers/crypto/atmel-tdes.c
+++ b/drivers/crypto/atmel-tdes.c
@@ -597,7 +597,7 @@ static void atmel_tdes_finish_req(struct atmel_tdes_dev *dd, int err)
 
        dd->flags &= ~TDES_FLAGS_BUSY;
 
-       if ((rctx->mode & TDES_FLAGS_OPMODE_MASK) != TDES_FLAGS_ECB)
+       if (!err && (rctx->mode & TDES_FLAGS_OPMODE_MASK) != TDES_FLAGS_ECB)
                atmel_tdes_set_iv_as_last_ciphertext_block(dd);
 
        req->base.complete(&req->base, err);