From: Eric Blake <eblake@redhat.com>
To: Jason Wang <jasowang@redhat.com>,
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
Subject: Re: [Qemu-devel] [PATCH V4 for 3.1 4/4] virtio-net-test: add large tx buffer test
Date: Mon, 3 Dec 2018 10:46:13 -0600 [thread overview]
Message-ID: <ebf8ecc1-fd57-d929-41aa-464dedce589c@redhat.com> (raw)
In-Reply-To: <20181203100608.28538-5-jasowang@redhat.com>
On 12/3/18 4:06 AM, Jason Wang wrote:
> 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.
Can you also add a packet just slightly larger than NET_BUFSIZE (68k) to
show that we aren't having any further issues at even smaller (and more
likely) values of oversized packets?
>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
> tests/virtio-net-test.c | 44 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 44 insertions(+)
>
> +++ b/tests/virtio-net-test.c
> @@ -245,6 +245,49 @@ 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 = UINT_MAX / 64;
> + int i;
> +
> + qs = pci_test_start("-netdev hubport,id=hp0,hubid=0 "
> + "-device virtio-net-pci,netdev=hp0 ");
Why the trailing space?
> + 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);
Any time I see both 'true' and 'false' in a ?: operator, I have to
wonder why you didn't just write the simpler version directly on the
condition. This is the same as '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 +313,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);
>
I can reproduce Peter's complaints of this introducing noise to 'make
check':
qemu-system-x86_64: warning: hub 0 is not connected to host network
With patches 2-4 applied but patch 1 omitted, 'make check' fails with:
Broken pipe
tests/libqtest.c:125: kill_qemu() detected QEMU death from signal 11
(Segmentation fault) (core dumped)
GTester: last random seed: R02S9569aabcb2d834a9dadcce272c5588db
so the test is definitely triggering the problem as patched by part 1.
Although I'm not confident enough of what the test is doing for an R-b,
and would like it to be less noisy, I can at least add:
Tested-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
next prev parent reply other threads:[~2018-12-03 16:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 10:06 [Qemu-devel] [PATCH V4 for 3.1 0/4] Fix possible OOB during queuing packets Jason Wang
2018-12-03 10:06 ` [Qemu-devel] [PATCH V4 for 3.1 1/4] net: drop too large packet early Jason Wang
2018-12-03 16:18 ` Eric Blake
2018-12-04 2:52 ` Jason Wang
2018-12-03 18:13 ` Thomas Huth
2018-12-04 2:55 ` Jason Wang
2018-12-03 10:06 ` [Qemu-devel] [PATCH V4 for 3.1 2/4] virtio-net-test: accept variable length argument in pci_test_start() Jason Wang
2018-12-03 16:25 ` Eric Blake
2018-12-03 18:18 ` Thomas Huth
2018-12-03 10:06 ` [Qemu-devel] [PATCH V4 for 3.1 3/4] virtio-net-test: remove unused macro Jason Wang
2018-12-03 16:26 ` Eric Blake
2018-12-03 10:06 ` [Qemu-devel] [PATCH V4 for 3.1 4/4] virtio-net-test: add large tx buffer test Jason Wang
2018-12-03 16:46 ` Eric Blake [this message]
2018-12-04 2:52 ` Jason Wang
2018-12-03 16:18 ` [Qemu-devel] [PATCH V4 for 3.1 0/4] Fix possible OOB during queuing packets Peter Maydell
2018-12-04 2:28 ` 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=ebf8ecc1-fd57-d929-41aa-464dedce589c@redhat.com \
--to=eblake@redhat.com \
--cc=jasowang@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).