From 77f451e54557dfa7851d66325bba9d9405dc2072 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Thu, 30 Jul 2015 12:08:04 +0200 Subject: [PATCH 13/13] RDMA: Fix error exits Message-id: <1438258084-15753-14-git-send-email-dgilbert@redhat.com> Patchwork-id: 67219 O-Subject: [RHEL-7.1.Z qemu-kvm-rhev PATCH 13/13] RDMA: Fix error exits Bugzilla: 1248382 RH-Acked-by: Marcel Apfelbaum RH-Acked-by: Amit Shah RH-Acked-by: Laszlo Ersek From: "Dr. David Alan Gilbert" 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 Message-Id: <1436555332-19076-1-git-send-email-dgilbert@redhat.com> Signed-off-by: Paolo Bonzini (cherry picked from commit 24b41d66c8ad8f77839fca777b92e365dad0cf5c) Signed-off-by: Miroslav Rezanina --- migration-rdma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/migration-rdma.c b/migration-rdma.c index 66f4aeb..c4cecf6 100644 --- a/migration-rdma.c +++ b/migration-rdma.c @@ -3054,7 +3054,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]); @@ -3150,7 +3150,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) { @@ -3160,7 +3160,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)); @@ -3176,7 +3176,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); -- 1.8.3.1