qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: amit.shah@redhat.com, "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Subject: [Qemu-devel] [PULL 12/26] Sanity check RDMA remote data
Date: Wed,  1 Jul 2015 12:39:36 +0200	[thread overview]
Message-ID: <1435747190-18017-13-git-send-email-quintela@redhat.com> (raw)
In-Reply-To: <1435747190-18017-1-git-send-email-quintela@redhat.com>

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Perform some basic (but probably not complete) sanity checking on
requests from the RDMA source.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Michael R. Hines <mrhines@us.ibm.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/rdma.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/migration/rdma.c b/migration/rdma.c
index 73844a3..73a79be 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -2992,6 +2992,13 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
             trace_qemu_rdma_registration_handle_compress(comp->length,
                                                          comp->block_idx,
                                                          comp->offset);
+            if (comp->block_idx >= rdma->local_ram_blocks.nb_blocks) {
+                error_report("rdma: 'compress' bad block index %u (vs %d)",
+                             (unsigned int)comp->block_idx,
+                             rdma->local_ram_blocks.nb_blocks);
+                ret = -EIO;
+                break;
+            }
             block = &(rdma->local_ram_blocks.block[comp->block_idx]);

             host_addr = block->local_host_addr +
@@ -3080,8 +3087,23 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
                 trace_qemu_rdma_registration_handle_register_loop(count,
                          reg->current_index, reg->key.current_addr, reg->chunks);

+                if (reg->current_index >= rdma->local_ram_blocks.nb_blocks) {
+                    error_report("rdma: 'register' bad block index %u (vs %d)",
+                                 (unsigned int)reg->current_index,
+                                 rdma->local_ram_blocks.nb_blocks);
+                    ret = -ENOENT;
+                    break;
+                }
                 block = &(rdma->local_ram_blocks.block[reg->current_index]);
                 if (block->is_ram_block) {
+                    if (block->offset > reg->key.current_addr) {
+                        error_report("rdma: bad register address for block %s"
+                            " offset: %" PRIx64 " current_addr: %" PRIx64,
+                            block->block_name, block->offset,
+                            reg->key.current_addr);
+                        ret = -ERANGE;
+                        break;
+                    }
                     host_addr = (block->local_host_addr +
                                 (reg->key.current_addr - block->offset));
                     chunk = ram_chunk_index(block->local_host_addr,
@@ -3090,6 +3112,14 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
                     chunk = reg->key.chunk;
                     host_addr = block->local_host_addr +
                         (reg->key.chunk * (1UL << RDMA_REG_CHUNK_SHIFT));
+                    /* Check for particularly bad chunk value */
+                    if (host_addr < (void *)block->local_host_addr) {
+                        error_report("rdma: bad chunk for block %s"
+                            " chunk: %" PRIx64,
+                            block->block_name, reg->key.chunk);
+                        ret = -ERANGE;
+                        break;
+                    }
                 }
                 chunk_start = ram_chunk_start(block, chunk);
                 chunk_end = ram_chunk_end(block, chunk + reg->chunks);
-- 
2.4.3

  parent reply	other threads:[~2015-07-01 10:40 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-01 10:39 [Qemu-devel] [PULL 00/26] Migration pull request Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 01/26] migration: protect migration_bitmap Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 02/26] migration: extend migration_bitmap Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 03/26] rdma: fix memory leak Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 04/26] Only try and read a VMDescription if it should be there Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 05/26] rdma typos Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 06/26] Store block name in local blocks structure Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 07/26] Translate offsets to destination address space Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 08/26] Rework ram_control_load_hook to hook during block load Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 09/26] Allow rdma_delete_block to work without the hash Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 10/26] Rework ram block hash Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 11/26] Sort destination RAMBlocks to be the same as the source Juan Quintela
2015-07-01 10:39 ` Juan Quintela [this message]
2015-07-01 10:39 ` [Qemu-devel] [PULL 13/26] Fail more cleanly in mismatched RAM cases Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 14/26] Fix older machine type compatibility on power with section footers Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 15/26] runstate: Add runstate store Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 16/26] runstate: migration allows more transitions now Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 17/26] migration: create new section to store global state Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 18/26] global_state: Make section optional Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 19/26] vmstate: Create optional sections Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 20/26] migration: Add configuration section Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 21/26] migration: Use cmpxchg correctly Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 22/26] migration: ensure we start in NONE state Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 23/26] migration: Use always helper to set state Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 24/26] migration: No need to call trace_migrate_set_state() Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 25/26] migration: create migration event Juan Quintela
2015-07-01 10:39 ` [Qemu-devel] [PULL 26/26] migration: Add migration events on target side Juan Quintela
2015-07-02  9:31 ` [Qemu-devel] [PULL 00/26] Migration pull request Peter Maydell
2015-07-02  9:51   ` Wen Congyang
2015-07-02 12:17   ` Juan Quintela
2015-07-02 12:30     ` Peter Maydell
2015-07-02 12:55       ` [Qemu-devel] Mutex error checking (was: [PULL 00/26] Migration pull request) Markus Armbruster
2015-07-02 12:58         ` Peter Maydell

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=1435747190-18017-13-git-send-email-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=amit.shah@redhat.com \
    --cc=dgilbert@redhat.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).