* [PATCH v2] crypto: s5p: update iv after AES-CBC op end
[not found] <CGME20190219160249eucas1p17f521e74a9acab6a330e72a3c682adce@eucas1p1.samsung.com>
@ 2019-02-19 16:02 ` Kamil Konieczny
2019-02-19 16:41 ` Krzysztof Kozlowski
2019-02-28 6:30 ` Herbert Xu
0 siblings, 2 replies; 3+ messages in thread
From: Kamil Konieczny @ 2019-02-19 16:02 UTC (permalink / raw)
To: k.konieczny
Cc: Krzysztof Kozlowski, Vladimir Zapolskiy, Herbert Xu,
David S. Miller, Eric Biggers, Bartlomiej Zolnierkiewicz,
Marek Szyprowski, linux-crypto, linux-samsung-soc, linux-kernel
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>
---
Changes since v1:
- reworded Subject and commit message
- changed code according to comments by Krzysztof Kozlowski
- added Reported-by line
---
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..30b4f1015d8f 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), 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. */
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] crypto: s5p: update iv after AES-CBC op end
2019-02-19 16:02 ` [PATCH v2] crypto: s5p: update iv after AES-CBC op end Kamil Konieczny
@ 2019-02-19 16:41 ` Krzysztof Kozlowski
2019-02-28 6:30 ` Herbert Xu
1 sibling, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2019-02-19 16:41 UTC (permalink / raw)
To: Kamil Konieczny
Cc: Vladimir Zapolskiy, Herbert Xu, David S. Miller, Eric Biggers,
Bartlomiej Zolnierkiewicz, Marek Szyprowski, linux-crypto,
linux-samsung-soc, linux-kernel
On Tue, 19 Feb 2019 at 17:02, Kamil Konieczny
<k.konieczny@partner.samsung.com> wrote:
>
> 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>
> ---
> Changes since v1:
> - reworded Subject and commit message
> - changed code according to comments by Krzysztof Kozlowski
> - added Reported-by line
> ---
> drivers/crypto/s5p-sss.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] crypto: s5p: update iv after AES-CBC op end
2019-02-19 16:02 ` [PATCH v2] crypto: s5p: update iv after AES-CBC op end Kamil Konieczny
2019-02-19 16:41 ` Krzysztof Kozlowski
@ 2019-02-28 6:30 ` Herbert Xu
1 sibling, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2019-02-28 6:30 UTC (permalink / raw)
To: Kamil Konieczny
Cc: Krzysztof Kozlowski, Vladimir Zapolskiy, David S. Miller,
Eric Biggers, Bartlomiej Zolnierkiewicz, Marek Szyprowski,
linux-crypto, linux-samsung-soc, linux-kernel
On Tue, Feb 19, 2019 at 05:02:32PM +0100, Kamil Konieczny wrote:
> 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>
> ---
> Changes since v1:
> - reworded Subject and commit message
> - changed code according to comments by Krzysztof Kozlowski
> - added Reported-by line
> ---
> drivers/crypto/s5p-sss.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
Patch applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-28 6:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CGME20190219160249eucas1p17f521e74a9acab6a330e72a3c682adce@eucas1p1.samsung.com>
2019-02-19 16:02 ` [PATCH v2] crypto: s5p: update iv after AES-CBC op end Kamil Konieczny
2019-02-19 16:41 ` Krzysztof Kozlowski
2019-02-28 6:30 ` Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).