From: Michael S. Tsirkin <mst@redhat.com>
Date: Sun, 17 Oct 2010 18:43:40 +0000 (+0200)
Subject: migration: don't segfault on invalid input
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=492fb99c4bef274a71178f5fab9b700c469a4230;p=qemu.git

migration: don't segfault on invalid input

host_from_stream_offset returns NULL on error,
return error instead of trying to use that address,
to avoid segfault on invalid stream.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/arch_init.c b/arch_init.c
index a910033c8c..4caadd0c0a 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -390,6 +390,9 @@ int ram_load(QEMUFile *f, void *opaque, int version_id)
                 host = qemu_get_ram_ptr(addr);
             else
                 host = host_from_stream_offset(f, addr, flags);
+            if (!host) {
+                return -EINVAL;
+            }
 
             ch = qemu_get_byte(f);
             memset(host, ch, TARGET_PAGE_SIZE);