Message ID | 1429545445-28216-11-git-send-email-dgilbert@redhat.com |
---|---|
State | New |
Headers | show |
On 04/20/2015 10:57 AM, Dr. David Alan Gilbert (git) wrote: > 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> > --- > migration/rdma.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/migration/rdma.c b/migration/rdma.c > index 36b78dc..0c9d446 100644 > --- a/migration/rdma.c > +++ b/migration/rdma.c > @@ -2940,6 +2940,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 + > @@ -3028,8 +3035,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, > @@ -3038,6 +3060,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); Reviewed-by: Michael R. Hines <mrhines@us.ibm.com>
diff --git a/migration/rdma.c b/migration/rdma.c index 36b78dc..0c9d446 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2940,6 +2940,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 + @@ -3028,8 +3035,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, @@ -3038,6 +3060,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);