Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: nx - Moving NX-AES-ECB to be processed logic

Browse Source 
The previous limits were estimated locally in a single step
basead on bound values, however it was not correct since
when given certain scatterlist the function nx_build_sg_lists
was consuming more sg entries than allocated causing a
memory corruption and crashes.

This patch removes the old logic and replaces it into nx_sg_build_lists
in order to build a correct nx_sg list using the correct sg_max limit
and bounds.

Signed-off-by: Leonidas S. Barbosa <leosilva@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Leonidas S. Barbosa 2014-10-28 15:46:49 -02:00 committed by Herbert Xu
parent 01a5aa08ef
commit c7b675de39
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/crypto/nx/nx-aes-ecb.c
View File

@ -72,27 +72,19 @@ static int ecb_aes_nx_crypt(struct blkcipher_desc *desc,
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; 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);
max_sg_len = min_t(u32, nx_driver.of.max_sg_len/sizeof(struct nx_sg),
nx_ctx->ap->sglen);
if (enc) if (enc)
NX_CPB_FDM(csbcpb) |= NX_FDM_ENDE_ENCRYPT; NX_CPB_FDM(csbcpb) |= NX_FDM_ENDE_ENCRYPT;
else else
NX_CPB_FDM(csbcpb) &= ~NX_FDM_ENDE_ENCRYPT; NX_CPB_FDM(csbcpb) &= ~NX_FDM_ENDE_ENCRYPT;
do { do {
to_process = min_t(u64, nbytes - processed, to_process = 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);
rc = nx_build_sg_lists(nx_ctx, desc, dst, src, to_process, rc = nx_build_sg_lists(nx_ctx, desc, dst, src, &to_process,
processed, NULL); processed, NULL);
if (rc) if (rc)
goto out; goto out;