2019-02-18 18:50:56

by Kamil Konieczny

Subject: [PATCH] crypto: s5p: update iv after AES op end

Fix bug "s5p-sss crypto driver doesn't set next AES-CBC IV". This should
also fix AES-CTR mode. Tested on Odroid U3 with Eric Biggers branch
"iv-out-testing".

Signed-off-by: Kamil Konieczny <[email protected]>
---
drivers/crypto/s5p-sss.c | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index 0064be0e3941..3ea058addad3 100644
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -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",
@@ -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), 0x10);
+
+ if (reqctx->mode & FLAGS_AES_CTR)
+ memcpy_fromio(req->info, dev->aes_ioaddr + SSS_REG_AES_CNT_DATA(0), 0x10);
}

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

2019-02-19 12:03:16

by Krzysztof Kozlowski

Subject: Re: [PATCH] crypto: s5p: update iv after AES op end

On Mon, 18 Feb 2019 at 17:01, Kamil Konieczny
<[email protected]> wrote:
>
> Fix bug "s5p-sss crypto driver doesn't set next AES-CBC IV". This should
> also fix AES-CTR mode. Tested on Odroid U3 with Eric Biggers branch
> "iv-out-testing".
>
> Signed-off-by: Kamil Konieczny <[email protected]>
> ---
> drivers/crypto/s5p-sss.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
> index 0064be0e3941..3ea058addad3 100644
> --- a/drivers/crypto/s5p-sss.c
> +++ b/drivers/crypto/s5p-sss.c
> @@ -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",
> @@ -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), 0x10);
> +

0x10 -> AES_BLOCK_SIZE

> + if (reqctx->mode & FLAGS_AES_CTR)

if -> else if

Beside that looks good.

Best regards,
Krzysztof