[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/11] RDMA: Fix error exits
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 05/11] RDMA: Fix error exits |
Date: |
Thu, 16 Jul 2015 18:55:52 +0200 |
From: "Dr. David Alan Gilbert" <address@hidden>
The error checks I added used 'break' after the error, but I'm
in a switch inside the while loop, so they need to be 'goto out'.
Spotted by coverity; entries 1311368 and 1311369
Fixes: afcddefd
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
migration/rdma.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index f106b2a..74876fd 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -2997,7 +2997,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f,
void *opaque)
(unsigned int)comp->block_idx,
rdma->local_ram_blocks.nb_blocks);
ret = -EIO;
- break;
+ goto out;
}
block = &(rdma->local_ram_blocks.block[comp->block_idx]);
@@ -3092,7 +3092,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f,
void *opaque)
(unsigned int)reg->current_index,
rdma->local_ram_blocks.nb_blocks);
ret = -ENOENT;
- break;
+ goto out;
}
block = &(rdma->local_ram_blocks.block[reg->current_index]);
if (block->is_ram_block) {
@@ -3102,7 +3102,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f,
void *opaque)
block->block_name, block->offset,
reg->key.current_addr);
ret = -ERANGE;
- break;
+ goto out;
}
host_addr = (block->local_host_addr +
(reg->key.current_addr - block->offset));
@@ -3118,7 +3118,7 @@ static int qemu_rdma_registration_handle(QEMUFile *f,
void *opaque)
" chunk: %" PRIx64,
block->block_name, reg->key.chunk);
ret = -ERANGE;
- break;
+ goto out;
}
}
chunk_start = ram_chunk_start(block, chunk);
--
2.4.3
- [Qemu-devel] [PULL 00/11] RCU, KVM, memory API, crypto, Coverity fixes for 2.4.0-rc1, Paolo Bonzini, 2015/07/16
- [Qemu-devel] [PULL 01/11] mips/kvm: Fix Big endian 32-bit register access, Paolo Bonzini, 2015/07/16
- [Qemu-devel] [PULL 02/11] mips/kvm: Sign extend registers written to KVM, Paolo Bonzini, 2015/07/16
- [Qemu-devel] [PULL 03/11] ppc/spapr_drc: fix memory leak, Paolo Bonzini, 2015/07/16
- [Qemu-devel] [PULL 04/11] arm/xlnx-zynqmp: fix memory leak, Paolo Bonzini, 2015/07/16
- [Qemu-devel] [PULL 05/11] RDMA: Fix error exits,
Paolo Bonzini <=
- [Qemu-devel] [PULL 07/11] rcu: actually register threads that have RCU read-side critical sections, Paolo Bonzini, 2015/07/16
- [Qemu-devel] [PULL 06/11] rcu: automatically unregister threads when they exit, Paolo Bonzini, 2015/07/16
- [Qemu-devel] [PULL 08/11] rcu: detect missing rcu_register_thread(), Paolo Bonzini, 2015/07/16
- [Qemu-devel] [PULL 10/11] crypto: fix build with nettle >= 3.0.0, Paolo Bonzini, 2015/07/16
- [Qemu-devel] [PULL 09/11] memory: fix refcount leak in memory_region_present, Paolo Bonzini, 2015/07/16
- [Qemu-devel] [PULL 11/11] crypto: avoid undefined behavior in nettle calls, Paolo Bonzini, 2015/07/16
- Re: [Qemu-devel] [PULL 00/11] RCU, KVM, memory API, crypto, Coverity fixes for 2.4.0-rc1, Peter Maydell, 2015/07/16