Skip to content

Commit

Permalink
crypto: s5p - update iv after AES-CBC op end
Browse files Browse the repository at this point in the history
Fix bug "s5p-sss crypto driver doesn't set next AES-CBC IV". While at this,
fix also AES-CTR mode. Tested on Odroid U3 with Eric Biggers branch
"iv-out-testing".

Signed-off-by: Kamil Konieczny <k.konieczny@partner.samsung.com>
Reported-by: Eric Biggers <ebiggers@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Kamil Konieczny authored and Herbert Xu committed Feb 28, 2019
1 parent 7748168 commit e8e3c1c
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/crypto/s5p-sss.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,9 @@ static void s5p_sg_copy_buf(void *buf, struct scatterlist *sg,

static void s5p_sg_done(struct s5p_aes_dev *dev)
{
struct ablkcipher_request *req = dev->req;
struct s5p_aes_reqctx *reqctx = ablkcipher_request_ctx(req);

if (dev->sg_dst_cpy) {
dev_dbg(dev->dev,
"Copying %d bytes of output data back to original place\n",
Expand All @@ -472,6 +475,11 @@ static void s5p_sg_done(struct s5p_aes_dev *dev)
}
s5p_free_sg_cpy(dev, &dev->sg_src_cpy);
s5p_free_sg_cpy(dev, &dev->sg_dst_cpy);
if (reqctx->mode & FLAGS_AES_CBC)
memcpy_fromio(req->info, dev->aes_ioaddr + SSS_REG_AES_IV_DATA(0), AES_BLOCK_SIZE);

else if (reqctx->mode & FLAGS_AES_CTR)
memcpy_fromio(req->info, dev->aes_ioaddr + SSS_REG_AES_CNT_DATA(0), AES_BLOCK_SIZE);
}

/* Calls the completion. Cannot be called with dev->lock hold. */
Expand Down

0 comments on commit e8e3c1c

Please sign in to comment.