Skip to contentSkip to conversation

FAILED: patch "[PATCH] crypto: virtio: Fix dest length calculation in" failed to apply to 5.4-stable tree

PATCH [email protected] 2 participants 2 messages Jun 15, 2020 – Jun 16, 2020

Subsystems (4)
Stable branch Crypto API virtio core virtio crypto driver
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From d90ca42012db2863a9a30b564a2ace6016594bda Mon Sep 17 00:00:00 2001
From: "Longpeng(Mike)" <[email protected]>
Date: Tue, 2 Jun 2020 15:05:01 +0800
Subject: [PATCH] crypto: virtio: Fix dest length calculation in
__virtio_crypto_skcipher_do_req()

The src/dst length is not aligned with AES_BLOCK_SIZE(which is 16) in some testcases in tcrypto.ko.

For example, the src/dst length of one of cts(cbc(aes))'s testcase is 17, the crypto_virtio driver will set @src_data_len=16 but @dst_data_len=17 in this case and get a wrong at then end.

SRC: pp pp pp pp pp pp pp pp pp pp pp pp pp pp pp pp pp (17 bytes)
EXP: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc pp (17 bytes)
DST: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc 00 (pollute the last bytes) (pp: plaintext cc:ciphertext)

Fix this issue by limit the length of dest buffer.

Fixes dbaf0624ffa5 ("crypto: add virtio-crypto driver")
Cc Gonglei <[email protected]>
Cc Herbert Xu <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
Cc Jason Wang <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Longpeng(Mike) <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Michael S. Tsirkin <[email protected]>
drivers/crypto/virtio/virtio_crypto_algs.c +1 -0
index 52261b6c247e..cb8a6ea2a4bc 100644
@@ -407,6 +407,7 @@ __virtio_crypto_skcipher_do_req(struct virtio_crypto_sym_request *vc_sym_req,
 		goto free;
 	}
 
+	dst_len = min_t(unsigned int, req->cryptlen, dst_len);
 	pr_debug("virtio_crypto: src_len: %u, dst_len: %llu\n",
 			req->cryptlen, dst_len);
maintainer
#1 lore raw
Quoted 32 lines · On Mon, Jun 15, 2020 at 10:30:24PM +0200, [email protected] wrote:

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From d90ca42012db2863a9a30b564a2ace6016594bda Mon Sep 17 00:00:00 2001
From: "Longpeng(Mike)" <[email protected]>
Date: Tue, 2 Jun 2020 15:05:01 +0800
Subject: [PATCH] crypto: virtio: Fix dest length calculation in __virtio_crypto_skcipher_do_req()

The src/dst length is not aligned with AES_BLOCK_SIZE(which is 16) in some testcases in tcrypto.ko.

For example, the src/dst length of one of cts(cbc(aes))'s testcase is 17, the crypto_virtio driver will set @src_data_len=16 but @dst_data_len=17 in this case and get a wrong at then end.

SRC: pp pp pp pp pp pp pp pp pp pp pp pp pp pp pp pp pp (17 bytes)
EXP: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc pp (17 bytes)
DST: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc 00 (pollute the last bytes) (pp: plaintext cc:ciphertext)

Fix this issue by limit the length of dest buffer.

Quoted 12 lines
Fixes dbaf0624ffa5 ("crypto: add virtio-crypto driver")
Cc Gonglei <[email protected]>
Cc Herbert Xu <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
Cc Jason Wang <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc [email protected]
Cc [email protected]
Cc [email protected]
Signed-off-by Longpeng(Mike) <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Michael S. Tsirkin <[email protected]>

Conflict due to missing eee1d6fca0a0 ("crypto: virtio - switch to skcipher API"). I've fixed it and queued up for 5.4, 4.19, and 4.14.

Signature · 2 lines
Thanks,
Sasha