1 files changed, 44 insertions, 26 deletions

diff --git a/drivers/crypto/nx/nx-aes-xcbc.c b/drivers/crypto/nx/nx-aes-xcbc.c
index 8c2faffab4a3..c2f7d4befb55 100644
--- a/drivers/crypto/nx/nx-aes-xcbc.c
+++ b/drivers/crypto/nx/nx-aes-xcbc.c
@@ -42,6 +42,7 @@ static int nx_xcbc_set_key(struct crypto_shash *desc,
                            unsigned int         key_len)
 {
         struct nx_crypto_ctx *nx_ctx = crypto_shash_ctx(desc);
+        struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
 
         switch (key_len) {
         case AES_KEYSIZE_128:
@@ -51,7 +52,7 @@ static int nx_xcbc_set_key(struct crypto_shash *desc,
                 return -EINVAL;
         }
 
-        memcpy(nx_ctx->priv.xcbc.key, in_key, key_len);
+        memcpy(csbcpb->cpb.aes_xcbc.key, in_key, key_len);
 
         return 0;
 }
@@ -148,32 +149,29 @@ out:
         return rc;
 }
 
-static int nx_xcbc_init(struct shash_desc *desc)
+static int nx_crypto_ctx_aes_xcbc_init2(struct crypto_tfm *tfm)
 {
-        struct xcbc_state *sctx = shash_desc_ctx(desc);
-        struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(&desc->tfm->base);
+        struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(tfm);
         struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
-        struct nx_sg *out_sg;
-        int len;
+        int err;
 
-        nx_ctx_init(nx_ctx, HCOP_FC_AES);
+        err = nx_crypto_ctx_aes_xcbc_init(tfm);
+        if (err)
+                return err;
 
-        memset(sctx, 0, sizeof *sctx);
+        nx_ctx_init(nx_ctx, HCOP_FC_AES);
 
         NX_CPB_SET_KEY_SIZE(csbcpb, NX_KS_AES_128);
         csbcpb->cpb.hdr.mode = NX_MODE_AES_XCBC_MAC;
 
-        memcpy(csbcpb->cpb.aes_xcbc.key, nx_ctx->priv.xcbc.key, AES_BLOCK_SIZE);
-        memset(nx_ctx->priv.xcbc.key, 0, sizeof *nx_ctx->priv.xcbc.key);
-
-        len = AES_BLOCK_SIZE;
-        out_sg = nx_build_sg_list(nx_ctx->out_sg, (u8 *)sctx->state,
-                                  &len, nx_ctx->ap->sglen);
+        return 0;
+}
 
-        if (len != AES_BLOCK_SIZE)
-                return -EINVAL;
+static int nx_xcbc_init(struct shash_desc *desc)
+{
+        struct xcbc_state *sctx = shash_desc_ctx(desc);
 
-        nx_ctx->op.outlen = (nx_ctx->out_sg - out_sg) * sizeof(struct nx_sg);
+        memset(sctx, 0, sizeof *sctx);
 
         return 0;
 }
@@ -186,6 +184,7 @@ static int nx_xcbc_update(struct shash_desc *desc,
         struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(&desc->tfm->base);
         struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
         struct nx_sg *in_sg;
+        struct nx_sg *out_sg;
         u32 to_process = 0, leftover, total;
         unsigned int max_sg_len;
         unsigned long irq_flags;
@@ -213,6 +212,17 @@ static int nx_xcbc_update(struct shash_desc *desc,
         max_sg_len = min_t(u64, max_sg_len,
                                 nx_ctx->ap->databytelen/NX_PAGE_SIZE);
 
+        data_len = AES_BLOCK_SIZE;
+        out_sg = nx_build_sg_list(nx_ctx->out_sg, (u8 *)sctx->state,
+                                  &len, nx_ctx->ap->sglen);
+
+        if (data_len != AES_BLOCK_SIZE) {
+                rc = -EINVAL;
+                goto out;
+        }
+
+        nx_ctx->op.outlen = (nx_ctx->out_sg - out_sg) * sizeof(struct nx_sg);
+
         do {
                 to_process = total - to_process;
                 to_process = to_process & ~(AES_BLOCK_SIZE - 1);
@@ -235,8 +245,10 @@ static int nx_xcbc_update(struct shash_desc *desc,
                                                 (u8 *) sctx->buffer,
                                                 &data_len,
                                                 max_sg_len);
-                        if (data_len != sctx->count)
-                                return -EINVAL;
+                        if (data_len != sctx->count) {
+                                rc = -EINVAL;
+                                goto out;
+                        }
                 }
 
                 data_len = to_process - sctx->count;
@@ -245,8 +257,10 @@ static int nx_xcbc_update(struct shash_desc *desc,
                                         &data_len,
                                         max_sg_len);
 
-                if (data_len != to_process - sctx->count)
-                        return -EINVAL;
+                if (data_len != to_process - sctx->count) {
+                        rc = -EINVAL;
+                        goto out;
+                }
 
                 nx_ctx->op.inlen = (nx_ctx->in_sg - in_sg) *
                                         sizeof(struct nx_sg);
@@ -325,15 +339,19 @@ static int nx_xcbc_final(struct shash_desc *desc, u8 *out)
         in_sg = nx_build_sg_list(nx_ctx->in_sg, (u8 *)sctx->buffer,
                                  &len, nx_ctx->ap->sglen);
 
-        if (len != sctx->count)
-                return -EINVAL;
+        if (len != sctx->count) {
+                rc = -EINVAL;
+                goto out;
+        }
 
         len = AES_BLOCK_SIZE;
         out_sg = nx_build_sg_list(nx_ctx->out_sg, out, &len,
                                   nx_ctx->ap->sglen);
 
-        if (len != AES_BLOCK_SIZE)
-                return -EINVAL;
+        if (len != AES_BLOCK_SIZE) {
+                rc = -EINVAL;
+                goto out;
+        }
 
         nx_ctx->op.inlen = (nx_ctx->in_sg - in_sg) * sizeof(struct nx_sg);
         nx_ctx->op.outlen = (nx_ctx->out_sg - out_sg) * sizeof(struct nx_sg);
@@ -372,7 +390,7 @@ struct shash_alg nx_shash_aes_xcbc_alg = {
                 .cra_blocksize   = AES_BLOCK_SIZE,
                 .cra_module      = THIS_MODULE,
                 .cra_ctxsize     = sizeof(struct nx_crypto_ctx),
-                .cra_init        = nx_crypto_ctx_aes_xcbc_init,
+                .cra_init        = nx_crypto_ctx_aes_xcbc_init2,
                 .cra_exit        = nx_crypto_ctx_exit,
         }
 };