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 <k.koniec...@partner.samsung.com>
---
 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

Reply via email to