From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: mst@redhat.com, ppandit@redhat.com, liq3ea@163.com,
liq3ea@gmail.com, pbonzini@redhat.com, thuth@redhat.com,
eblake@redhat.com, Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PATCH V3 for 3.1 4/4] virtio-net-test: add large tx buffer test
Date: Mon, 3 Dec 2018 17:35:44 +0800 [thread overview]
Message-ID: <20181203093544.6184-5-jasowang@redhat.com> (raw)
In-Reply-To: <20181203093544.6184-1-jasowang@redhat.com>
This test tries to build a packet whose size is greater than INT_MAX
which tries to trigger integer overflow in qemu_net_queue_append_iov()
which may result OOB.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
tests/virtio-net-test.c | 45 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c
index f12f0afb51..22df5b6f37 100644
--- a/tests/virtio-net-test.c
+++ b/tests/virtio-net-test.c
@@ -242,6 +242,50 @@ static void pci_basic(gconstpointer data)
g_free(dev);
qtest_shutdown(qs);
}
+
+static void large_tx(gconstpointer data)
+{
+ QVirtioPCIDevice *dev;
+ QOSState *qs;
+ QVirtQueuePCI *tx, *rx;
+ QVirtQueue *vq;
+ const char *cmd = "-netdev hubport,id=hp0,hubid=0 "
+ "-device virtio-net-pci,netdev=hp0 ";
+ uint64_t req_addr;
+ uint32_t free_head;
+ size_t alloc_size = UINT_MAX / 64;
+ int i;
+
+ qs = pci_test_start(cmd);
+ dev = virtio_net_pci_init(qs->pcibus, PCI_SLOT);
+
+ rx = (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 0);
+ tx = (QVirtQueuePCI *)qvirtqueue_setup(&dev->vdev, qs->alloc, 1);
+
+ driver_init(&dev->vdev);
+ vq = &tx->vq;
+
+ /* Bypass the limitation by pointing several descriptors to a single
+ * smaller area */
+ req_addr = guest_alloc(qs->alloc, alloc_size);
+ free_head = qvirtqueue_add(vq, req_addr, alloc_size, false, true);
+
+ for (i = 0; i < 64; i++) {
+ qvirtqueue_add(vq, req_addr, alloc_size, false, i == 63 ?
+ false : true);
+ }
+ qvirtqueue_kick(&dev->vdev, vq, free_head);
+
+ qvirtio_wait_used_elem(&dev->vdev, vq, free_head, NULL,
+ QVIRTIO_NET_TIMEOUT_US);
+
+ qvirtqueue_cleanup(dev->vdev.bus, &tx->vq, qs->alloc);
+ qvirtqueue_cleanup(dev->vdev.bus, &rx->vq, qs->alloc);
+ qvirtio_pci_device_disable(dev);
+ g_free(dev->pdev);
+ g_free(dev);
+ qtest_shutdown(qs);
+}
#endif
static void hotplug(void)
@@ -267,6 +311,7 @@ int main(int argc, char **argv)
qtest_add_data_func("/virtio/net/pci/basic", send_recv_test, pci_basic);
qtest_add_data_func("/virtio/net/pci/rx_stop_cont",
stop_cont_test, pci_basic);
+ qtest_add_data_func("/virtio/net/pci/large_tx", NULL, large_tx);
#endif
qtest_add_func("/virtio/net/pci/hotplug", hotplug);
--
2.17.1
next prev parent reply other threads:[~2018-12-03 9:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 9:35 [Qemu-devel] [PATCH V3 for 3.1 0/4] Fix possible OOB during queuing packets Jason Wang
2018-12-03 9:35 ` [Qemu-devel] [PATCH V3 for 3.1 1/4] net: drop too large packet early Jason Wang
2018-12-03 9:35 ` [Qemu-devel] [PATCH V3 for 3.1 2/4] virtio-net-test: accept command line string instead of socket Jason Wang
2018-12-03 9:35 ` [Qemu-devel] [PATCH V3 for 3.1 3/4] virtio-net-test: remove unused macro Jason Wang
2018-12-03 9:35 ` Jason Wang [this message]
2018-12-03 9:47 ` [Qemu-devel] [PATCH V3 for 3.1 0/4] Fix possible OOB during queuing packets Jason Wang
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=20181203093544.6184-5-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=eblake@redhat.com \
--cc=liq3ea@163.com \
--cc=liq3ea@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=ppandit@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).