qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Amit Shah <amit.shah@redhat.com>
To: qemu list <qemu-devel@nongnu.org>
Cc: Amit Shah <amit.shah@redhat.com>, Paul Brook <paul@codesourcery.com>
Subject: [Qemu-devel] [PATCH 4/5] virtio-serial: Don't copy over guest buffer to host
Date: Fri, 10 Dec 2010 18:55:17 +0530	[thread overview]
Message-ID: <60d0ef242fa5d7e014a8c56f2bcc6d0cd7b6e56e.1291987020.git.amit.shah@redhat.com> (raw)
In-Reply-To: <cover.1291987020.git.amit.shah@redhat.com>
In-Reply-To: <cover.1291987020.git.amit.shah@redhat.com>

When the guest writes something to a host, we copied over the entire
buffer first into the host and then processed it.  Do away with that, it
could result in a malicious guest causing a DoS on the host.

Reported-by: Paul Brook <paul@codesourcery.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 hw/virtio-serial-bus.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index ecf0056..3bbd915 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -125,17 +125,21 @@ static void do_flush_queued_data(VirtIOSerialPort *port, VirtQueue *vq,
         return;
     }
     while (virtqueue_pop(vq, &elem)) {
-        uint8_t *buf;
-        size_t ret, buf_size;
+        unsigned int i;
 
-        if (!discard) {
-            buf_size = iov_size(elem.out_sg, elem.out_num);
-            buf = qemu_malloc(buf_size);
-            ret = iov_to_buf(elem.out_sg, elem.out_num, buf, 0, buf_size);
+        if (discard) {
+            goto next;
+        }
+        for (i = 0; i < elem.out_num; i++) {
+            size_t buf_size;
 
-            port->info->have_data(port, buf, ret);
-            qemu_free(buf);
+            buf_size = elem.out_sg[i].iov_len;
+
+            port->info->have_data(port,
+                                  elem.out_sg[i].iov_base,
+                                  buf_size);
         }
+    next:
         virtqueue_push(vq, &elem, 0);
     }
     virtio_notify(vdev, vq);
-- 
1.7.3.2

  parent reply	other threads:[~2010-12-10 13:25 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-10 13:25 [Qemu-devel] [PATCH 0/5] virtio-serial: Trivial fixes, don't copy buffers to host Amit Shah
2010-12-10 13:25 ` [Qemu-devel] [PATCH 1/5] virtio-console: Factor out common init between console and generic ports Amit Shah
2010-12-10 13:25 ` [Qemu-devel] [PATCH 2/5] virtio-console: Remove unnecessary braces Amit Shah
2010-12-10 13:25 ` [Qemu-devel] [PATCH 3/5] virtio-serial: Simplify condition for a while loop Amit Shah
2010-12-10 13:25 ` Amit Shah [this message]
2010-12-10 14:02   ` [Qemu-devel] Re: [PATCH 4/5] virtio-serial: Don't copy over guest buffer to host Paul Brook
2010-12-10 14:59     ` Amit Shah
2010-12-10 15:17       ` Paul Brook
2010-12-10 15:26         ` Amit Shah
2010-12-10 13:25 ` [Qemu-devel] [PATCH 5/5] virtio-serial: Error out if guest sends unexpected vq elements Amit Shah
2010-12-10 13:59   ` [Qemu-devel] " Paul Brook
2010-12-10 14:59     ` Amit Shah
2010-12-10 15:17       ` Paul Brook
2010-12-10 15:30         ` Amit Shah

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=60d0ef242fa5d7e014a8c56f2bcc6d0cd7b6e56e.1291987020.git.amit.shah@redhat.com \
    --to=amit.shah@redhat.com \
    --cc=paul@codesourcery.com \
    --cc=qemu-devel@nongnu.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: 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).