Commit b02989f3 authored by Longpeng(Mike)'s avatar Longpeng(Mike) Committed by Michael S. Tsirkin

crypto: virtio: Fix src/dst scatterlist calculation in __virtio_crypto_skcipher_do_req()

The system will crash when the users insmod crypto/tcrypt.ko with mode=38
( testing "cts(cbc(aes))" ).

Usually the next entry of one sg will be @sg@ + 1, but if this sg element
is part of a chained scatterlist, it could jump to the start of a new
scatterlist array. Fix it by sg_next() on calculation of src/dst
scatterlist.

Fixes: dbaf0624 ("crypto: add virtio-crypto driver")
Reported-by: default avatarLABBE Corentin <clabbe@baylibre.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: virtualization@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200123101000.GB24255@RedSigned-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Signed-off-by: default avatarLongpeng(Mike) <longpeng2@huawei.com>
Link: https://lore.kernel.org/r/20200602070501.2023-2-longpeng2@huawei.comSigned-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent fb69c2c8
...@@ -350,13 +350,18 @@ __virtio_crypto_skcipher_do_req(struct virtio_crypto_sym_request *vc_sym_req, ...@@ -350,13 +350,18 @@ __virtio_crypto_skcipher_do_req(struct virtio_crypto_sym_request *vc_sym_req,
int err; int err;
unsigned long flags; unsigned long flags;
struct scatterlist outhdr, iv_sg, status_sg, **sgs; struct scatterlist outhdr, iv_sg, status_sg, **sgs;
int i;
u64 dst_len; u64 dst_len;
unsigned int num_out = 0, num_in = 0; unsigned int num_out = 0, num_in = 0;
int sg_total; int sg_total;
uint8_t *iv; uint8_t *iv;
struct scatterlist *sg;
src_nents = sg_nents_for_len(req->src, req->cryptlen); src_nents = sg_nents_for_len(req->src, req->cryptlen);
if (src_nents < 0) {
pr_err("Invalid number of src SG.\n");
return src_nents;
}
dst_nents = sg_nents(req->dst); dst_nents = sg_nents(req->dst);
pr_debug("virtio_crypto: Number of sgs (src_nents: %d, dst_nents: %d)\n", pr_debug("virtio_crypto: Number of sgs (src_nents: %d, dst_nents: %d)\n",
...@@ -442,12 +447,12 @@ __virtio_crypto_skcipher_do_req(struct virtio_crypto_sym_request *vc_sym_req, ...@@ -442,12 +447,12 @@ __virtio_crypto_skcipher_do_req(struct virtio_crypto_sym_request *vc_sym_req,
vc_sym_req->iv = iv; vc_sym_req->iv = iv;
/* Source data */ /* Source data */
for (i = 0; i < src_nents; i++) for (sg = req->src; src_nents; sg = sg_next(sg), src_nents--)
sgs[num_out++] = &req->src[i]; sgs[num_out++] = sg;
/* Destination data */ /* Destination data */
for (i = 0; i < dst_nents; i++) for (sg = req->dst; sg; sg = sg_next(sg))
sgs[num_out + num_in++] = &req->dst[i]; sgs[num_out + num_in++] = sg;
/* Status */ /* Status */
sg_init_one(&status_sg, &vc_req->status, sizeof(vc_req->status)); sg_init_one(&status_sg, &vc_req->status, sizeof(vc_req->status));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment