From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z5f-0004AP-S1 for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:22:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4Z55-00088R-UH for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:22:03 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:60016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z55-00087q-M6 for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:21:27 -0400 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Jul 2014 11:21:27 -0600 From: Michael Roth Date: Tue, 8 Jul 2014 12:17:39 -0500 Message-Id: <1404839947-1086-69-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 068/156] migration: catch unknown flags in ram_load List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Peter Lieven if a saved vm has unknown flags in the memory data qemu currently simply ignores this flag and continues which yields in an unpredictable result. This patch catches all unknown flags and aborts the loading of the vm. Additionally error reports are thrown if the migration aborts abnormally. Signed-off-by: Peter Lieven Signed-off-by: Juan Quintela (cherry picked from commit db80facefa62dff42bb50c73b0f03eda5f732b49) Conflicts: arch_init.c *removed unecessary context from 4798fe55 Signed-off-by: Michael Roth --- arch_init.c | 32 +++++++++++++++++--------------- migration.c | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/arch_init.c b/arch_init.c index 85652aa..8038937 100644 --- a/arch_init.c +++ b/arch_init.c @@ -857,7 +857,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) { ram_addr_t addr; int flags, ret = 0; - int error; static uint64_t seq_iter; seq_iter++; @@ -866,7 +865,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) return -EINVAL; } - do { + while (!ret) { addr = qemu_get_be64(f); flags = addr & ~TARGET_PAGE_MASK; @@ -895,7 +894,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) " in != " RAM_ADDR_FMT "\n", id, length, block->length); ret = -EINVAL; - goto done; } break; } @@ -905,14 +903,14 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) fprintf(stderr, "Unknown ramblock \"%s\", cannot " "accept migration\n", id); ret = -EINVAL; - goto done; + } + if (ret) { + break; } total_ram_bytes -= length; } - } - - if (flags & RAM_SAVE_FLAG_COMPRESS) { + } else if (flags & RAM_SAVE_FLAG_COMPRESS) { void *host; uint8_t ch; @@ -939,20 +937,24 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) } if (load_xbzrle(f, addr, host) < 0) { + error_report("Failed to decompress XBZRLE page at " + RAM_ADDR_FMT, addr); ret = -EINVAL; - goto done; + break; } } else if (flags & RAM_SAVE_FLAG_HOOK) { ram_control_load_hook(f, flags); + } else if (flags & RAM_SAVE_FLAG_EOS) { + /* normal exit */ + break; + } else { + error_report("Unknown migration flags: %#x", flags); + ret = -EINVAL; + break; } - error = qemu_file_get_error(f); - if (error) { - ret = error; - goto done; - } - } while (!(flags & RAM_SAVE_FLAG_EOS)); + ret = qemu_file_get_error(f); + } -done: DPRINTF("Completed load of VM with exit code %d seq iteration " "%" PRIu64 "\n", ret, seq_iter); return ret; diff --git a/migration.c b/migration.c index 79c86c9..22a1399 100644 --- a/migration.c +++ b/migration.c @@ -105,7 +105,7 @@ static void process_incoming_migration_co(void *opaque) ret = qemu_loadvm_state(f); qemu_fclose(f); if (ret < 0) { - fprintf(stderr, "load of migration failed\n"); + error_report("load of migration failed: %s", strerror(-ret)); exit(EXIT_FAILURE); } qemu_announce_self(); -- 1.9.1