From: Ard Biesheuvel <ardb@kernel.org> To: linux-crypto@vger.kernel.org Cc: Ard Biesheuvel <ardb@kernel.org>, Herbert Xu <herbert@gondor.apana.org.au>, "David S. Miller" <davem@davemloft.net>, Eric Biggers <ebiggers@google.com>, linux-arm-kernel@lists.infradead.org, "Michael S. Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, Gonglei <arei.gonglei@huawei.com>, virtualization@lists.linux-foundation.org Subject: [PATCH v3 02/29] crypto: virtio - deal with unsupported input sizes Date: Tue, 5 Nov 2019 14:27:59 +0100 [thread overview] Message-ID: <20191105132826.1838-3-ardb@kernel.org> (raw) In-Reply-To: <20191105132826.1838-1-ardb@kernel.org> Return -EINVAL for input sizes that are not a multiple of the AES block size, since they are not supported by our CBC chaining mode. While at it, remove the pr_err() that reports unsupported key sizes being used: we shouldn't spam the kernel log with that. Fixes: dbaf0624ffa5 ("crypto: add virtio-crypto driver") Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Jason Wang <jasowang@redhat.com> Cc: Gonglei <arei.gonglei@huawei.com> Cc: virtualization@lists.linux-foundation.org Signed-off-by: Ard Biesheuvel <ardb@kernel.org> --- drivers/crypto/virtio/virtio_crypto_algs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/virtio/virtio_crypto_algs.c b/drivers/crypto/virtio/virtio_crypto_algs.c index 65ec10800137..82b316b2f537 100644 --- a/drivers/crypto/virtio/virtio_crypto_algs.c +++ b/drivers/crypto/virtio/virtio_crypto_algs.c @@ -105,8 +105,6 @@ virtio_crypto_alg_validate_key(int key_len, uint32_t *alg) *alg = VIRTIO_CRYPTO_CIPHER_AES_CBC; break; default: - pr_err("virtio_crypto: Unsupported key length: %d\n", - key_len); return -EINVAL; } return 0; @@ -489,6 +487,11 @@ static int virtio_crypto_ablkcipher_encrypt(struct ablkcipher_request *req) /* Use the first data virtqueue as default */ struct data_queue *data_vq = &vcrypto->data_vq[0]; + if (!req->nbytes) + return 0; + if (req->nbytes % AES_BLOCK_SIZE) + return -EINVAL; + vc_req->dataq = data_vq; vc_req->alg_cb = virtio_crypto_dataq_sym_callback; vc_sym_req->ablkcipher_ctx = ctx; @@ -509,6 +512,11 @@ static int virtio_crypto_ablkcipher_decrypt(struct ablkcipher_request *req) /* Use the first data virtqueue as default */ struct data_queue *data_vq = &vcrypto->data_vq[0]; + if (!req->nbytes) + return 0; + if (req->nbytes % AES_BLOCK_SIZE) + return -EINVAL; + vc_req->dataq = data_vq; vc_req->alg_cb = virtio_crypto_dataq_sym_callback; vc_sym_req->ablkcipher_ctx = ctx; -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Ard Biesheuvel <ardb@kernel.org> To: linux-crypto@vger.kernel.org Cc: Herbert Xu <herbert@gondor.apana.org.au>, "Michael S. Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, Eric Biggers <ebiggers@google.com>, Ard Biesheuvel <ardb@kernel.org>, Gonglei <arei.gonglei@huawei.com>, virtualization@lists.linux-foundation.org, "David S. Miller" <davem@davemloft.net>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 02/29] crypto: virtio - deal with unsupported input sizes Date: Tue, 5 Nov 2019 14:27:59 +0100 [thread overview] Message-ID: <20191105132826.1838-3-ardb@kernel.org> (raw) In-Reply-To: <20191105132826.1838-1-ardb@kernel.org> Return -EINVAL for input sizes that are not a multiple of the AES block size, since they are not supported by our CBC chaining mode. While at it, remove the pr_err() that reports unsupported key sizes being used: we shouldn't spam the kernel log with that. Fixes: dbaf0624ffa5 ("crypto: add virtio-crypto driver") Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Jason Wang <jasowang@redhat.com> Cc: Gonglei <arei.gonglei@huawei.com> Cc: virtualization@lists.linux-foundation.org Signed-off-by: Ard Biesheuvel <ardb@kernel.org> --- drivers/crypto/virtio/virtio_crypto_algs.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/virtio/virtio_crypto_algs.c b/drivers/crypto/virtio/virtio_crypto_algs.c index 65ec10800137..82b316b2f537 100644 --- a/drivers/crypto/virtio/virtio_crypto_algs.c +++ b/drivers/crypto/virtio/virtio_crypto_algs.c @@ -105,8 +105,6 @@ virtio_crypto_alg_validate_key(int key_len, uint32_t *alg) *alg = VIRTIO_CRYPTO_CIPHER_AES_CBC; break; default: - pr_err("virtio_crypto: Unsupported key length: %d\n", - key_len); return -EINVAL; } return 0; @@ -489,6 +487,11 @@ static int virtio_crypto_ablkcipher_encrypt(struct ablkcipher_request *req) /* Use the first data virtqueue as default */ struct data_queue *data_vq = &vcrypto->data_vq[0]; + if (!req->nbytes) + return 0; + if (req->nbytes % AES_BLOCK_SIZE) + return -EINVAL; + vc_req->dataq = data_vq; vc_req->alg_cb = virtio_crypto_dataq_sym_callback; vc_sym_req->ablkcipher_ctx = ctx; @@ -509,6 +512,11 @@ static int virtio_crypto_ablkcipher_decrypt(struct ablkcipher_request *req) /* Use the first data virtqueue as default */ struct data_queue *data_vq = &vcrypto->data_vq[0]; + if (!req->nbytes) + return 0; + if (req->nbytes % AES_BLOCK_SIZE) + return -EINVAL; + vc_req->dataq = data_vq; vc_req->alg_cb = virtio_crypto_dataq_sym_callback; vc_sym_req->ablkcipher_ctx = ctx; -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-11-05 13:28 UTC|newest] Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-05 13:27 [PATCH v3 00/29] crypto: convert h/w accelerator drivers to skcipher API Ard Biesheuvel 2019-11-05 13:27 ` Ard Biesheuvel 2019-11-05 13:27 ` [PATCH v3 01/29] crypto: virtio - implement missing support for output IVs Ard Biesheuvel 2019-11-05 13:27 ` Ard Biesheuvel 2019-11-05 13:27 ` Ard Biesheuvel [this message] 2019-11-05 13:27 ` [PATCH v3 02/29] crypto: virtio - deal with unsupported input sizes Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 03/29] crypto: virtio - switch to skcipher API Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 17:32 ` Eric Biggers 2019-11-05 17:32 ` Eric Biggers 2019-11-05 13:28 ` [PATCH v3 04/29] crypto: ccp - switch from ablkcipher to skcipher Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 05/29] crypto: omap - switch to skcipher API Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 06/29] crypto: ux500 " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 07/29] crypto: s5p " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 08/29] crypto: atmel-aes " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-09 6:23 ` Tudor.Ambarus 2019-11-09 6:23 ` Tudor.Ambarus 2019-11-05 13:28 ` [PATCH v3 09/29] crypto: atmel-tdes " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-09 6:17 ` Tudor.Ambarus 2019-11-09 6:17 ` Tudor.Ambarus 2019-11-05 13:28 ` [PATCH v3 10/29] crypto: bcm-spu " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 11/29] crypto: nitrox - remove cra_type reference to ablkcipher Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 12/29] crypto: cavium/cpt - switch to skcipher API Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 13/29] crypto: chelsio " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 14/29] crypto: hifn " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 15/29] crypto: ixp4xx " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 16/29] crypto: mxs " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 17/29] crypto: mediatek " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-10 18:31 ` Matthias Brugger 2019-11-10 18:31 ` Matthias Brugger 2019-11-10 18:31 ` Matthias Brugger 2019-11-05 13:28 ` [PATCH v3 18/29] crypto: sahara " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 19/29] crypto: picoxcell " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 20/29] crypto: qce " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 21/29] crypto: stm32 " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 22/29] crypto: niagara2 " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 23/29] crypto: rockchip " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 24/29] crypto: talitos " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 25/29] crypto: qat " Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-07 11:26 ` Giovanni Cabiddu 2019-11-07 11:26 ` Giovanni Cabiddu 2019-11-07 11:34 ` Ard Biesheuvel 2019-11-07 11:34 ` Ard Biesheuvel 2019-11-08 9:14 ` Herbert Xu 2019-11-08 9:14 ` Herbert Xu 2019-11-05 13:28 ` [PATCH v3 26/29] crypto: marvell/cesa - rename blkcipher to skcipher Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 27/29] crypto: nx - remove stale comment referring to the blkcipher walk API Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 13:28 ` [PATCH v3 28/29] crypto: remove deprecated and unused ablkcipher support Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-05 17:52 ` Eric Biggers 2019-11-05 17:52 ` Eric Biggers 2019-11-06 4:03 ` Herbert Xu 2019-11-06 4:03 ` Herbert Xu 2019-11-05 13:28 ` [PATCH v3 29/29] crypto: ccree - update a stale reference to ablkcipher Ard Biesheuvel 2019-11-05 13:28 ` Ard Biesheuvel 2019-11-06 6:24 ` Gilad Ben-Yossef 2019-11-06 6:24 ` Gilad Ben-Yossef
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191105132826.1838-3-ardb@kernel.org \ --to=ardb@kernel.org \ --cc=arei.gonglei@huawei.com \ --cc=davem@davemloft.net \ --cc=ebiggers@google.com \ --cc=herbert@gondor.apana.org.au \ --cc=jasowang@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-crypto@vger.kernel.org \ --cc=mst@redhat.com \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.