Commit 1ad936e8 authored by Kent Yoder's avatar Kent Yoder Committed by Benjamin Herrenschmidt

drivers/crypto/nx: Fixes for multiple races and issues

Fixes a race on driver init with registering algorithms where the
driver status flag wasn't being set before self testing started.

  Added the cra_alignmask field for CBC and ECB modes.

  Fixed a bug in GCM where AES block size was being used instead of
authsize.

  Removed use of blkcipher_walk routines for scatterlist processing.
Corner cases in the code prevent us from processing an entire
scatterlist at a time and walking the buffers in block sized chunks
turns out to be unecessary anyway.

  Fixed off-by-one error in saving off extra data in the sha code.

  Fixed accounting error for number of bytes processed in the sha code.
Signed-off-by: default avatarKent Yoder <key@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 519fe2ec
...@@ -126,6 +126,7 @@ struct crypto_alg nx_cbc_aes_alg = { ...@@ -126,6 +126,7 @@ struct crypto_alg nx_cbc_aes_alg = {
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct nx_crypto_ctx), .cra_ctxsize = sizeof(struct nx_crypto_ctx),
.cra_type = &crypto_blkcipher_type, .cra_type = &crypto_blkcipher_type,
.cra_alignmask = 0xf,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
.cra_init = nx_crypto_ctx_aes_cbc_init, .cra_init = nx_crypto_ctx_aes_cbc_init,
.cra_exit = nx_crypto_ctx_exit, .cra_exit = nx_crypto_ctx_exit,
......
...@@ -123,6 +123,7 @@ struct crypto_alg nx_ecb_aes_alg = { ...@@ -123,6 +123,7 @@ struct crypto_alg nx_ecb_aes_alg = {
.cra_priority = 300, .cra_priority = 300,
.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER, .cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER,
.cra_blocksize = AES_BLOCK_SIZE, .cra_blocksize = AES_BLOCK_SIZE,
.cra_alignmask = 0xf,
.cra_ctxsize = sizeof(struct nx_crypto_ctx), .cra_ctxsize = sizeof(struct nx_crypto_ctx),
.cra_type = &crypto_blkcipher_type, .cra_type = &crypto_blkcipher_type,
.cra_module = THIS_MODULE, .cra_module = THIS_MODULE,
......
...@@ -219,7 +219,7 @@ static int gcm_aes_nx_crypt(struct aead_request *req, int enc) ...@@ -219,7 +219,7 @@ static int gcm_aes_nx_crypt(struct aead_request *req, int enc)
if (enc) if (enc)
NX_CPB_FDM(csbcpb) |= NX_FDM_ENDE_ENCRYPT; NX_CPB_FDM(csbcpb) |= NX_FDM_ENDE_ENCRYPT;
else else
nbytes -= AES_BLOCK_SIZE; nbytes -= crypto_aead_authsize(crypto_aead_reqtfm(req));
csbcpb->cpb.aes_gcm.bit_length_data = nbytes * 8; csbcpb->cpb.aes_gcm.bit_length_data = nbytes * 8;
......
...@@ -69,7 +69,7 @@ static int nx_sha256_update(struct shash_desc *desc, const u8 *data, ...@@ -69,7 +69,7 @@ static int nx_sha256_update(struct shash_desc *desc, const u8 *data,
* 1: <= SHA256_BLOCK_SIZE: copy into state, return 0 * 1: <= SHA256_BLOCK_SIZE: copy into state, return 0
* 2: > SHA256_BLOCK_SIZE: process X blocks, copy in leftover * 2: > SHA256_BLOCK_SIZE: process X blocks, copy in leftover
*/ */
if (len + sctx->count <= SHA256_BLOCK_SIZE) { if (len + sctx->count < SHA256_BLOCK_SIZE) {
memcpy(sctx->buf + sctx->count, data, len); memcpy(sctx->buf + sctx->count, data, len);
sctx->count += len; sctx->count += len;
goto out; goto out;
...@@ -110,6 +110,7 @@ static int nx_sha256_update(struct shash_desc *desc, const u8 *data, ...@@ -110,6 +110,7 @@ static int nx_sha256_update(struct shash_desc *desc, const u8 *data,
atomic_inc(&(nx_ctx->stats->sha256_ops)); atomic_inc(&(nx_ctx->stats->sha256_ops));
/* copy the leftover back into the state struct */ /* copy the leftover back into the state struct */
if (leftover)
memcpy(sctx->buf, data + len - leftover, leftover); memcpy(sctx->buf, data + len - leftover, leftover);
sctx->count = leftover; sctx->count = leftover;
...@@ -130,6 +131,7 @@ static int nx_sha256_final(struct shash_desc *desc, u8 *out) ...@@ -130,6 +131,7 @@ static int nx_sha256_final(struct shash_desc *desc, u8 *out)
struct nx_sg *in_sg, *out_sg; struct nx_sg *in_sg, *out_sg;
int rc; int rc;
if (NX_CPB_FDM(csbcpb) & NX_FDM_CONTINUATION) { if (NX_CPB_FDM(csbcpb) & NX_FDM_CONTINUATION) {
/* we've hit the nx chip previously, now we're finalizing, /* we've hit the nx chip previously, now we're finalizing,
* so copy over the partial digest */ * so copy over the partial digest */
...@@ -162,7 +164,7 @@ static int nx_sha256_final(struct shash_desc *desc, u8 *out) ...@@ -162,7 +164,7 @@ static int nx_sha256_final(struct shash_desc *desc, u8 *out)
atomic_inc(&(nx_ctx->stats->sha256_ops)); atomic_inc(&(nx_ctx->stats->sha256_ops));
atomic64_add(csbcpb->cpb.sha256.message_bit_length, atomic64_add(csbcpb->cpb.sha256.message_bit_length / 8,
&(nx_ctx->stats->sha256_bytes)); &(nx_ctx->stats->sha256_bytes));
memcpy(out, csbcpb->cpb.sha256.message_digest, SHA256_DIGEST_SIZE); memcpy(out, csbcpb->cpb.sha256.message_digest, SHA256_DIGEST_SIZE);
out: out:
......
...@@ -69,7 +69,7 @@ static int nx_sha512_update(struct shash_desc *desc, const u8 *data, ...@@ -69,7 +69,7 @@ static int nx_sha512_update(struct shash_desc *desc, const u8 *data,
* 1: <= SHA512_BLOCK_SIZE: copy into state, return 0 * 1: <= SHA512_BLOCK_SIZE: copy into state, return 0
* 2: > SHA512_BLOCK_SIZE: process X blocks, copy in leftover * 2: > SHA512_BLOCK_SIZE: process X blocks, copy in leftover
*/ */
if ((u64)len + sctx->count[0] <= SHA512_BLOCK_SIZE) { if ((u64)len + sctx->count[0] < SHA512_BLOCK_SIZE) {
memcpy(sctx->buf + sctx->count[0], data, len); memcpy(sctx->buf + sctx->count[0], data, len);
sctx->count[0] += len; sctx->count[0] += len;
goto out; goto out;
...@@ -110,6 +110,7 @@ static int nx_sha512_update(struct shash_desc *desc, const u8 *data, ...@@ -110,6 +110,7 @@ static int nx_sha512_update(struct shash_desc *desc, const u8 *data,
atomic_inc(&(nx_ctx->stats->sha512_ops)); atomic_inc(&(nx_ctx->stats->sha512_ops));
/* copy the leftover back into the state struct */ /* copy the leftover back into the state struct */
if (leftover)
memcpy(sctx->buf, data + len - leftover, leftover); memcpy(sctx->buf, data + len - leftover, leftover);
sctx->count[0] = leftover; sctx->count[0] = leftover;
...@@ -168,7 +169,7 @@ static int nx_sha512_final(struct shash_desc *desc, u8 *out) ...@@ -168,7 +169,7 @@ static int nx_sha512_final(struct shash_desc *desc, u8 *out)
goto out; goto out;
atomic_inc(&(nx_ctx->stats->sha512_ops)); atomic_inc(&(nx_ctx->stats->sha512_ops));
atomic64_add(csbcpb->cpb.sha512.message_bit_length_lo, atomic64_add(csbcpb->cpb.sha512.message_bit_length_lo / 8,
&(nx_ctx->stats->sha512_bytes)); &(nx_ctx->stats->sha512_bytes));
memcpy(out, csbcpb->cpb.sha512.message_digest, SHA512_DIGEST_SIZE); memcpy(out, csbcpb->cpb.sha512.message_digest, SHA512_DIGEST_SIZE);
......
...@@ -211,44 +211,20 @@ int nx_build_sg_lists(struct nx_crypto_ctx *nx_ctx, ...@@ -211,44 +211,20 @@ int nx_build_sg_lists(struct nx_crypto_ctx *nx_ctx,
{ {
struct nx_sg *nx_insg = nx_ctx->in_sg; struct nx_sg *nx_insg = nx_ctx->in_sg;
struct nx_sg *nx_outsg = nx_ctx->out_sg; struct nx_sg *nx_outsg = nx_ctx->out_sg;
struct blkcipher_walk walk;
int rc;
blkcipher_walk_init(&walk, dst, src, nbytes);
rc = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE);
if (rc)
goto out;
if (iv) if (iv)
memcpy(iv, walk.iv, AES_BLOCK_SIZE); memcpy(iv, desc->info, AES_BLOCK_SIZE);
while (walk.nbytes) {
nx_insg = nx_build_sg_list(nx_insg, walk.src.virt.addr,
walk.nbytes, nx_ctx->ap->sglen);
nx_outsg = nx_build_sg_list(nx_outsg, walk.dst.virt.addr,
walk.nbytes, nx_ctx->ap->sglen);
rc = blkcipher_walk_done(desc, &walk, 0);
if (rc)
break;
}
if (walk.nbytes) {
nx_insg = nx_build_sg_list(nx_insg, walk.src.virt.addr,
walk.nbytes, nx_ctx->ap->sglen);
nx_outsg = nx_build_sg_list(nx_outsg, walk.dst.virt.addr,
walk.nbytes, nx_ctx->ap->sglen);
rc = 0; nx_insg = nx_walk_and_build(nx_insg, nx_ctx->ap->sglen, src, 0, nbytes);
} nx_outsg = nx_walk_and_build(nx_outsg, nx_ctx->ap->sglen, dst, 0, nbytes);
/* these lengths should be negative, which will indicate to phyp that /* these lengths should be negative, which will indicate to phyp that
* the input and output parameters are scatterlists, not linear * the input and output parameters are scatterlists, not linear
* buffers */ * buffers */
nx_ctx->op.inlen = (nx_ctx->in_sg - nx_insg) * sizeof(struct nx_sg); nx_ctx->op.inlen = (nx_ctx->in_sg - nx_insg) * sizeof(struct nx_sg);
nx_ctx->op.outlen = (nx_ctx->out_sg - nx_outsg) * sizeof(struct nx_sg); nx_ctx->op.outlen = (nx_ctx->out_sg - nx_outsg) * sizeof(struct nx_sg);
out:
return rc; return 0;
} }
/** /**
...@@ -454,6 +430,8 @@ static int nx_register_algs(void) ...@@ -454,6 +430,8 @@ static int nx_register_algs(void)
if (rc) if (rc)
goto out; goto out;
nx_driver.of.status = NX_OKAY;
rc = crypto_register_alg(&nx_ecb_aes_alg); rc = crypto_register_alg(&nx_ecb_aes_alg);
if (rc) if (rc)
goto out; goto out;
...@@ -498,8 +476,6 @@ static int nx_register_algs(void) ...@@ -498,8 +476,6 @@ static int nx_register_algs(void)
if (rc) if (rc)
goto out_unreg_s512; goto out_unreg_s512;
nx_driver.of.status = NX_OKAY;
goto out; goto out;
out_unreg_s512: out_unreg_s512:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment