crypto: nx - fix limits to sg lists for AES-ECB

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / nx / nx-aes-ecb.c

diff --git a/drivers/crypto/nx/nx-aes-ecb.c b/drivers/crypto/nx/nx-aes-ecb.c
index fe0d803ed233e3b5c387e38d81642d290f358c29..85a8d23cf29d72b14180c6f7e7777786010c2094 100644 (file)
--- a/drivers/crypto/nx/nx-aes-ecb.c
+++ b/drivers/crypto/nx/nx-aes-ecb.c
@@ -71,37 +71,49 @@ static int ecb_aes_nx_crypt(struct blkcipher_desc *desc,
        struct nx_crypto_ctx *nx_ctx = crypto_blkcipher_ctx(desc->tfm);
        struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
        unsigned long irq_flags;
+       unsigned int processed = 0, to_process;
+       u32 max_sg_len;
        int rc;
 
        spin_lock_irqsave(&nx_ctx->lock, irq_flags);
 
-       if (nbytes > nx_ctx->ap->databytelen) {
-               rc = -EINVAL;
-               goto out;
-       }
+       max_sg_len = min_t(u32, nx_driver.of.max_sg_len/sizeof(struct nx_sg),
+                          nx_ctx->ap->sglen);
 
        if (enc)
                NX_CPB_FDM(csbcpb) |= NX_FDM_ENDE_ENCRYPT;
        else
                NX_CPB_FDM(csbcpb) &= ~NX_FDM_ENDE_ENCRYPT;
 
-       rc = nx_build_sg_lists(nx_ctx, desc, dst, src, nbytes, 0, NULL);
-       if (rc)
-               goto out;
+       do {
+               to_process = min_t(u64, nbytes - processed,
+                                  nx_ctx->ap->databytelen);
+               to_process = min_t(u64, to_process,
+                                  NX_PAGE_SIZE * (max_sg_len - 1));
+               to_process = to_process & ~(AES_BLOCK_SIZE - 1);
 
-       if (!nx_ctx->op.inlen || !nx_ctx->op.outlen) {
-               rc = -EINVAL;
-               goto out;
-       }
+               rc = nx_build_sg_lists(nx_ctx, desc, dst, src, to_process,
+                               processed, NULL);
+               if (rc)
+                       goto out;
+
+               if (!nx_ctx->op.inlen || !nx_ctx->op.outlen) {
+                       rc = -EINVAL;
+                       goto out;
+               }
+
+               rc = nx_hcall_sync(nx_ctx, &nx_ctx->op,
+                                  desc->flags & CRYPTO_TFM_REQ_MAY_SLEEP);
+               if (rc)
+                       goto out;
+
+               atomic_inc(&(nx_ctx->stats->aes_ops));
+               atomic64_add(csbcpb->csb.processed_byte_count,
+                            &(nx_ctx->stats->aes_bytes));
 
-       rc = nx_hcall_sync(nx_ctx, &nx_ctx->op,
-                          desc->flags & CRYPTO_TFM_REQ_MAY_SLEEP);
-       if (rc)
-               goto out;
+               processed += to_process;
+       } while (processed < nbytes);
 
-       atomic_inc(&(nx_ctx->stats->aes_ops));
-       atomic64_add(csbcpb->csb.processed_byte_count,
-                    &(nx_ctx->stats->aes_bytes));
 out:
        spin_unlock_irqrestore(&nx_ctx->lock, irq_flags);
        return rc;