qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	qemu-stable@nongnu.org, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PATCH 22/23] virtio-scsi: fix buffer overrun on invalid state load
Date: Tue, 3 Dec 2013 18:29:21 +0200	[thread overview]
Message-ID: <1386087086-3691-23-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1386087086-3691-1-git-send-email-mst@redhat.com>

CVE-2013-4542

hw/scsi/scsi-bus.c invokes load_request.

 virtio_scsi_load_request does:
    qemu_get_buffer(f, (unsigned char *)&req->elem, sizeof(req->elem));

this probably can make elem invalid, for example,
make in_num or out_num huge, then:

    virtio_scsi_parse_req(s, vs->cmd_vqs[n], req);

will do:

    if (req->elem.out_num > 1) {
        qemu_sgl_init_external(req, &req->elem.out_sg[1],
                               &req->elem.out_addr[1],
                               req->elem.out_num - 1);
    } else {
        qemu_sgl_init_external(req, &req->elem.in_sg[1],
                               &req->elem.in_addr[1],
                               req->elem.in_num - 1);
    }

and this will access out of array bounds.
suggested patch:

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/scsi/virtio-scsi.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 26d95a1..51cc929 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -147,6 +147,8 @@ static void *virtio_scsi_load_request(QEMUFile *f, SCSIRequest *sreq)
     qemu_get_be32s(f, &n);
     assert(n < vs->conf.num_queues);
     qemu_get_buffer(f, (unsigned char *)&req->elem, sizeof(req->elem));
+    assert(req->elem.in_num <= ARRAY_SIZE(req->elem.in_sg));
+    assert(req->elem.out_num <= ARRAY_SIZE(req->elem.out_sg));
     virtio_scsi_parse_req(s, vs->cmd_vqs[n], req);
 
     scsi_req_ref(sreq);
-- 
MST

  parent reply	other threads:[~2013-12-03 16:26 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-03 16:28 [Qemu-devel] [PATCH 00/23] qemu state loading issues Michael S. Tsirkin
2013-12-03 16:28 ` [Qemu-devel] [PATCH 01/23] virtio-net: fix buffer overflow on invalid state load Michael S. Tsirkin
2013-12-03 18:47   ` Peter Maydell
2013-12-03 16:28 ` [Qemu-devel] [PATCH 02/23] virtio-net: out-of-bounds buffer write on load Michael S. Tsirkin
2013-12-03 19:25   ` Peter Maydell
2013-12-03 16:28 ` [Qemu-devel] [PATCH 03/23] virtio-net: out-of-bounds buffer write on invalid state load Michael S. Tsirkin
2013-12-03 16:28 ` [Qemu-devel] [PATCH 04/23] virtio: " Michael S. Tsirkin
2013-12-03 16:28 ` [Qemu-devel] [PATCH 05/23] ahci: fix buffer overrun " Michael S. Tsirkin
2013-12-03 16:28 ` [Qemu-devel] [PATCH 06/23] hpet: " Michael S. Tsirkin
2013-12-03 18:39   ` Peter Maydell
2013-12-03 16:28 ` [Qemu-devel] [PATCH 07/23] hw/pci/pcie_aer.c: fix buffer overruns " Michael S. Tsirkin
2013-12-03 18:30   ` Peter Maydell
2013-12-03 20:41     ` Michael S. Tsirkin
2013-12-03 20:59       ` Peter Maydell
2013-12-03 21:19         ` Eric Blake
2013-12-03 21:25           ` Peter Maydell
2013-12-04  8:40         ` Michael S. Tsirkin
2013-12-03 16:28 ` [Qemu-devel] [PATCH 08/23] pl022: fix buffer overun " Michael S. Tsirkin
2013-12-03 16:28 ` [Qemu-devel] [PATCH 09/23] target-arm/machine.c: fix buffer overflow " Michael S. Tsirkin
2013-12-03 17:16   ` Peter Maydell
2013-12-03 16:28 ` [Qemu-devel] [PATCH 10/23] stellaris_enet: avoid buffer overrun on incoming migration Michael S. Tsirkin
2013-12-03 20:23   ` Peter Maydell
2013-12-03 16:28 ` [Qemu-devel] [PATCH 11/23] stellaris_enet: avoid buffer overrun on incoming migration (part 2) Michael S. Tsirkin
2013-12-03 18:36   ` Peter Maydell
2013-12-03 20:19   ` Peter Maydell
2013-12-03 16:28 ` [Qemu-devel] [PATCH 12/23] stellaris_enet: avoid buffer orerrun on incoming migration (part 3) Michael S. Tsirkin
2013-12-03 20:22   ` Peter Maydell
2013-12-03 16:28 ` [Qemu-devel] [PATCH 13/23] virtio: avoid buffer overrun on incoming migration Michael S. Tsirkin
2013-12-03 16:28 ` [Qemu-devel] [PATCH 14/23] openpic: " Michael S. Tsirkin
2013-12-03 16:29 ` [Qemu-devel] [PATCH 15/23] pxa2xx: " Michael S. Tsirkin
2013-12-03 19:46   ` Don Koch
2013-12-03 20:56     ` Michael Roth
2013-12-03 19:48   ` Peter Maydell
2013-12-03 16:29 ` [Qemu-devel] [PATCH 16/23] virtio: validate num_sg when mapping Michael S. Tsirkin
2013-12-03 16:29 ` [Qemu-devel] [PATCH 17/23] ssi-sd: fix buffer overrun on invalid state load Michael S. Tsirkin
2013-12-03 16:29 ` [Qemu-devel] [PATCH 18/23] ssd0323: fix buffer overun " Michael S. Tsirkin
2013-12-03 19:30   ` Peter Maydell
2013-12-03 16:29 ` [Qemu-devel] [PATCH 19/23] tsc210x: fix buffer overrun " Michael S. Tsirkin
2014-03-06 19:41   ` Andreas Färber
2013-12-03 16:29 ` [Qemu-devel] [PATCH 20/23] zaurus: " Michael S. Tsirkin
2013-12-03 19:44   ` Peter Maydell
2013-12-03 16:29 ` [Qemu-devel] [PATCH 21/23] usb: sanity check setup_index+setup_len in post_load Michael S. Tsirkin
2013-12-03 16:29 ` Michael S. Tsirkin [this message]
2013-12-03 18:19   ` [Qemu-devel] [PATCH 22/23] virtio-scsi: fix buffer overrun on invalid state load Peter Maydell
2013-12-03 19:24     ` Paolo Bonzini
2014-03-06 18:30       ` Andreas Färber
2014-03-06 18:36         ` Michael S. Tsirkin
2014-03-06 19:40           ` Paolo Bonzini
2014-03-06 19:43             ` Peter Maydell
2013-12-03 16:29 ` [Qemu-devel] [PATCH 23/23] savevm: fix potential segfault on invalid state Michael S. Tsirkin
2014-03-06 18:24   ` Andreas Färber
2013-12-03 18:24 ` [Qemu-devel] [PATCH 00/23] qemu state loading issues Peter Maydell
2013-12-04 11:01   ` Michael S. Tsirkin

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=1386087086-3691-23-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@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).