mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-26 10:49:33 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
This patch updates the nx-aes-ctr implementation to perform several
hyper calls if needed in order to always respect the length limits for
scatter/gather lists.

Two different limits are considered:

 - "ibm,max-sg-len": maximum number of bytes of each scatter/gather
   list.

 - "ibm,max-sync-cop":
    - The total number of bytes that a scatter/gather list can hold.
    - The maximum number of elements that a scatter/gather list can have.

Reviewed-by: Joy Latten <jmlatten@linux.vnet.ibm.com>
Signed-off-by: Marcelo Cerri <mhcerri@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Marcelo Cerri 2013-08-29 11:36:34 -03:00 committed by Herbert Xu
parent 2d290f0240
commit 884d981b04
1 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
drivers/crypto/nx/nx-aes-ctr.c
View file

@ -89,33 +89,45 @@ static int ctr_aes_nx_crypt(struct blkcipher_desc *desc,
struct nx_crypto_ctx *nx_ctx = crypto_blkcipher_ctx(desc->tfm); struct nx_crypto_ctx *nx_ctx = crypto_blkcipher_ctx(desc->tfm);
struct nx_csbcpb *csbcpb = nx_ctx->csbcpb; struct nx_csbcpb *csbcpb = nx_ctx->csbcpb;
unsigned long irq_flags; unsigned long irq_flags;
unsigned int processed = 0, to_process;
u32 max_sg_len;
int rc; int rc;
spin_lock_irqsave(&nx_ctx->lock, irq_flags); spin_lock_irqsave(&nx_ctx->lock, irq_flags);
if (nbytes > nx_ctx->ap->databytelen) { max_sg_len = min_t(u32, nx_driver.of.max_sg_len/sizeof(struct nx_sg),
rc = -EINVAL; nx_ctx->ap->sglen);
goto out;
}
rc = nx_build_sg_lists(nx_ctx, desc, dst, src, nbytes, 0, do {
csbcpb->cpb.aes_ctr.iv); to_process = min_t(u64, nbytes - processed,
if (rc) nx_ctx->ap->databytelen);
goto out; 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 = nx_build_sg_lists(nx_ctx, desc, dst, src, to_process,
rc = -EINVAL; processed, csbcpb->cpb.aes_ctr.iv);
goto out; if (rc)
} goto out;
rc = nx_hcall_sync(nx_ctx, &nx_ctx->op, if (!nx_ctx->op.inlen || !nx_ctx->op.outlen) {
desc->flags & CRYPTO_TFM_REQ_MAY_SLEEP); rc = -EINVAL;
if (rc) goto out;
goto out; }
atomic_inc(&(nx_ctx->stats->aes_ops)); rc = nx_hcall_sync(nx_ctx, &nx_ctx->op,
atomic64_add(csbcpb->csb.processed_byte_count, desc->flags & CRYPTO_TFM_REQ_MAY_SLEEP);
&(nx_ctx->stats->aes_bytes)); if (rc)
goto out;
memcpy(desc->info, csbcpb->cpb.aes_cbc.cv, AES_BLOCK_SIZE);
atomic_inc(&(nx_ctx->stats->aes_ops));
atomic64_add(csbcpb->csb.processed_byte_count,
&(nx_ctx->stats->aes_bytes));
processed += to_process;
} while (processed < nbytes);
out: out:
spin_unlock_irqrestore(&nx_ctx->lock, irq_flags); spin_unlock_irqrestore(&nx_ctx->lock, irq_flags);
return rc; return rc;