This is a note to let you know that I've just added the patch titled

    crypto: virtio - implement missing support for output IVs

to the 5.4-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     crypto-virtio-implement-missing-support-for-output-ivs.patch
and it can be found in the queue-5.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 500e6807ce93b1fdc7d5b827c5cc167cc35630db Mon Sep 17 00:00:00 2001
From: Ard Biesheuvel <[email protected]>
Date: Sat, 9 Nov 2019 18:09:26 +0100
Subject: crypto: virtio - implement missing support for output IVs

From: Ard Biesheuvel <[email protected]>

commit 500e6807ce93b1fdc7d5b827c5cc167cc35630db upstream.

In order to allow for CBC to be chained, which is something that the
CTS template relies upon, implementations of CBC need to pass the
IV to be used for subsequent invocations via the IV buffer. This was
not implemented yet for virtio-crypto so implement it now.

Fixes: dbaf0624ffa5 ("crypto: add virtio-crypto driver")
Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Jason Wang <[email protected]>
Cc: Gonglei <[email protected]>
Cc: [email protected]
Signed-off-by: Ard Biesheuvel <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/crypto/virtio/virtio_crypto_algs.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- a/drivers/crypto/virtio/virtio_crypto_algs.c
+++ b/drivers/crypto/virtio/virtio_crypto_algs.c
@@ -435,6 +435,11 @@ __virtio_crypto_ablkcipher_do_req(struct
                goto free;
        }
        memcpy(iv, req->info, ivsize);
+       if (!vc_sym_req->encrypt)
+               scatterwalk_map_and_copy(req->info, req->src,
+                                        req->nbytes - AES_BLOCK_SIZE,
+                                        AES_BLOCK_SIZE, 0);
+
        sg_init_one(&iv_sg, iv, ivsize);
        sgs[num_out++] = &iv_sg;
        vc_sym_req->iv = iv;
@@ -571,6 +576,10 @@ static void virtio_crypto_ablkcipher_fin
        struct ablkcipher_request *req,
        int err)
 {
+       if (vc_sym_req->encrypt)
+               scatterwalk_map_and_copy(req->info, req->dst,
+                                        req->nbytes - AES_BLOCK_SIZE,
+                                        AES_BLOCK_SIZE, 0);
        crypto_finalize_ablkcipher_request(vc_sym_req->base.dataq->engine,
                                           req, err);
        kzfree(vc_sym_req->iv);


Patches currently in stable-queue which might be from [email protected] are

queue-5.4/crypto-virtio-implement-missing-support-for-output-ivs.patch
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Reply via email to