aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2018-12-04 11:53:47 +0800
committerPeter Maydell <peter.maydell@linaro.org>2018-12-04 11:06:15 +0000
commit118cafff251318d16e1cfdef9cbf6b7d1e74cdb5 (patch)
treed1e6f863e61171b9c11421d91150bbf421f7a9bf
parent432a82d72720f71cb965b64836672f19d57ceedb (diff)
downloadqemu-118cafff251318d16e1cfdef9cbf6b7d1e74cdb5.zip
qemu-118cafff251318d16e1cfdef9cbf6b7d1e74cdb5.tar.gz
qemu-118cafff251318d16e1cfdef9cbf6b7d1e74cdb5.tar.bz2
virtio-net-test: add large tx buffer test
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. Signed-off-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-id: 20181204035347.6148-6-jasowang@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--tests/virtio-net-test.c46
1 files changed, 46 insertions, 0 deletions
diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c
index bdd6af9..e9783e6 100644
--- a/tests/virtio-net-test.c
+++ b/tests/virtio-net-test.c
@@ -245,6 +245,48 @@ 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;
+ uint64_t req_addr;
+ uint32_t free_head;
+ size_t alloc_size = (size_t)data / 64;
+ int i;
+
+ qs = pci_test_start("-netdev hubport,id=hp0,hubid=0 "
+ "-device virtio-net-pci,netdev=hp0");
+ 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);
+ }
+ 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)
@@ -270,6 +312,10 @@ 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_uint_max",
+ (gconstpointer)UINT_MAX, large_tx);
+ qtest_add_data_func("/virtio/net/pci/large_tx_net_bufsize",
+ (gconstpointer)NET_BUFSIZE, large_tx);
#endif
qtest_add_func("/virtio/net/pci/hotplug", hotplug);