crypto: nx - Fix reentrancy bugs

This patch fixes a host of reentrancy bugs in the nx driver.  The
following algorithms are affected:

* CCM
* GCM
* CTR
* XCBC
* SHA256
* SHA512

The crypto API allows a single transform to be used by multiple
threads simultaneously.  For example, IPsec will use a single tfm
to process packets for a given SA.  As packets may arrive on
multiple CPUs that tfm must be reentrant.

The nx driver does try to deal with this by using a spin lock.
Unfortunately only the basic AES/CBC/ECB algorithms do this in
the correct way.

The symptom of these bugs may range from the generation of incorrect
output to memory corruption.

Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

8 files changed, 125 insertions, 79 deletions

diff --git a/drivers/crypto/nx/nx-aes-ccm.c b/drivers/crypto/nx/nx-aes-ccm.c
index 67f80813a06f..e4311ce0cd78 100644
--- a/drivers/crypto/nx/nx-aes-ccm.c
+++ b/drivers/crypto/nx/nx-aes-ccm.c
@@ -494,8 +494,9 @@ out:
 static int ccm4309_aes_nx_encrypt(struct aead_request *req)
 {
         struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
+        struct nx_gcm_rctx *rctx = aead_request_ctx(req);
         struct blkcipher_desc desc;
-        u8 *iv = nx_ctx->priv.ccm.iv;
+        u8 *iv = rctx->iv;
 
         iv[0] = 3;
         memcpy(iv + 1, nx_ctx->priv.ccm.nonce, 3);
@@ -525,8 +526,9 @@ static int ccm_aes_nx_encrypt(struct aead_request *req)
 static int ccm4309_aes_nx_decrypt(struct aead_request *req)
 {
         struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
+        struct nx_gcm_rctx *rctx = aead_request_ctx(req);
         struct blkcipher_desc desc;
-        u8 *iv = nx_ctx->priv.ccm.iv;
+        u8 *iv = rctx->iv;
 
         iv[0] = 3;
         memcpy(iv + 1, nx_ctx->priv.ccm.nonce, 3);
diff --git a/drivers/crypto/nx/nx-aes-ctr.c b/drivers/crypto/nx/nx-aes-ctr.c
index 2617cd4d54dd..dd7e9f3f5b6b 100644
--- a/drivers/crypto/nx/nx-aes-ctr.c
+++ b/drivers/crypto/nx/nx-aes-ctr.c
@@ -72,7 +72,7 @@ static int ctr3686_aes_nx_set_key(struct crypto_tfm *tfm,
         if (key_len < CTR_RFC3686_NONCE_SIZE)
                 return -EINVAL;
 
-        memcpy(nx_ctx->priv.ctr.iv,
+        memcpy(nx_ctx->priv.ctr.nonce,
                in_key + key_len - CTR_RFC3686_NONCE_SIZE,
                CTR_RFC3686_NONCE_SIZE);
 
@@ -131,14 +131,15 @@ static int ctr3686_aes_nx_crypt(struct blkcipher_desc *desc,
                                 unsigned int           nbytes)
 {
         struct nx_crypto_ctx *nx_ctx = crypto_blkcipher_ctx(desc->tfm);
-        u8 *iv = nx_ctx->priv.ctr.iv;
+        u8 iv[16];
 
+        memcpy(iv, nx_ctx->priv.ctr.nonce, CTR_RFC3686_IV_SIZE);
         memcpy(iv + CTR_RFC3686_NONCE_SIZE,
                desc->info, CTR_RFC3686_IV_SIZE);
         iv[12] = iv[13] = iv[14] = 0;
         iv[15] = 1;
 
-        desc->info = nx_ctx->priv.ctr.iv;
+        desc->info = iv;
 
         return ctr_aes_nx_crypt(desc, dst, src, nbytes);
 }
diff --git a/drivers/crypto/nx/nx-aes-gcm.c b/drivers/crypto/nx/nx-aes-gcm.c
index 08ac6d48688c..92c993f08213 100644
--- a/drivers/crypto/nx/nx-aes-gcm.c
+++ b/drivers/crypto/nx/nx-aes-gcm.c
@@ -317,6 +317,7 @@ out:
 static int gcm_aes_nx_crypt(struct aead_request *req, int enc)
 {
         struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
+        struct nx_gcm_rctx *rctx = aead_request_ctx(req);
         struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
         struct blkcipher_desc desc;
         unsigned int nbytes = req->cryptlen;
@@ -326,7 +327,7 @@ static int gcm_aes_nx_crypt(struct aead_request *req, int enc)
 
         spin_lock_irqsave(&nx_ctx->lock, irq_flags);
 
-        desc.info = nx_ctx->priv.gcm.iv;
+        desc.info = rctx->iv;
         /* initialize the counter */
         *(u32 *)(desc.info + NX_GCM_CTR_OFFSET) = 1;
 
@@ -424,8 +425,8 @@ out:
 
 static int gcm_aes_nx_encrypt(struct aead_request *req)
 {
-        struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
-        char *iv = nx_ctx->priv.gcm.iv;
+        struct nx_gcm_rctx *rctx = aead_request_ctx(req);
+        char *iv = rctx->iv;
 
         memcpy(iv, req->iv, 12);
 
@@ -434,8 +435,8 @@ static int gcm_aes_nx_encrypt(struct aead_request *req)
 
 static int gcm_aes_nx_decrypt(struct aead_request *req)
 {
-        struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
-        char *iv = nx_ctx->priv.gcm.iv;
+        struct nx_gcm_rctx *rctx = aead_request_ctx(req);
+        char *iv = rctx->iv;
 
         memcpy(iv, req->iv, 12);
 
@@ -445,7 +446,8 @@ static int gcm_aes_nx_decrypt(struct aead_request *req)
 static int gcm4106_aes_nx_encrypt(struct aead_request *req)
 {
         struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
-        char *iv = nx_ctx->priv.gcm.iv;
+        struct nx_gcm_rctx *rctx = aead_request_ctx(req);
+        char *iv = rctx->iv;
         char *nonce = nx_ctx->priv.gcm.nonce;
 
         memcpy(iv, nonce, NX_GCM4106_NONCE_LEN);
@@ -457,7 +459,8 @@ static int gcm4106_aes_nx_encrypt(struct aead_request *req)
 static int gcm4106_aes_nx_decrypt(struct aead_request *req)
 {
         struct nx_crypto_ctx *nx_ctx = crypto_tfm_ctx(req->base.tfm);
-        char *iv = nx_ctx->priv.gcm.iv;
+        struct nx_gcm_rctx *rctx = aead_request_ctx(req);
+        char *iv = rctx->iv;
         char *nonce = nx_ctx->priv.gcm.nonce;
 
         memcpy(iv, nonce, NX_GCM4106_NONCE_LEN);
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);