5a0f88db96
Fix CVE-2013-4148 (bnc#864812), CVE-2013-4149 (bnc#864649), CVE-2013-4150 (bnc#864650), CVE-2013-4151 (bnc#864653), CVE-2013-4526 (bnc#864671), CVE-2013-4527 (bnc#864673), CVE-2013-4529 (bnc#864678), CVE-2013-4530 (bnc#864682), CVE-2013-4531 (bnc#864796), CVE-2013-4533 (bnc#864655), CVE-2013-4534 (bnc#864811), CVE-2013-4535 / CVE-2013-4536 (bnc#864665), CVE-2013-4537 (bnc#864391), CVE-2013-4538 (bnc#864769), CVE-2013-4539 (bnc#864805), CVE-2013-4540 (bnc#864801), CVE-2013-4541 (bnc#864802), CVE-2013-4542 (bnc#864804), CVE-2013-6399 (bnc#864814), CVE-2014-0182 (bnc#874788) OBS-URL: https://build.opensuse.org/request/show/235280 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=211
103 lines
4.3 KiB
Diff
103 lines
4.3 KiB
Diff
From 9ad9afb2ff3fa91c1315bd198e0118f8025b8805 Mon Sep 17 00:00:00 2001
|
|
From: Peter Maydell <peter.maydell@linaro.org>
|
|
Date: Thu, 3 Apr 2014 19:52:28 +0300
|
|
Subject: [PATCH] savevm: Ignore minimum_version_id_old if there is no
|
|
load_state_old
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
At the moment we require vmstate definitions to set minimum_version_id_old
|
|
to the same value as minimum_version_id if they do not provide a
|
|
load_state_old handler. Since the load_state_old functionality is
|
|
required only for a handful of devices that need to retain migration
|
|
compatibility with a pre-vmstate implementation, this means the bulk
|
|
of devices have pointless boilerplate. Relax the definition so that
|
|
minimum_version_id_old is ignored if there is no load_state_old handler.
|
|
|
|
Note that under the old scheme we would segfault if the vmstate
|
|
specified a minimum_version_id_old that was less than minimum_version_id
|
|
but did not provide a load_state_old function, and the incoming state
|
|
specified a version number between minimum_version_id_old and
|
|
minimum_version_id. Under the new scheme this will just result in
|
|
our failing the migration.
|
|
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
(cherry picked from commit 767adce2d9cd397de3418caa16be35ea18d56f22)
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
docs/migration.txt | 12 +++++-------
|
|
vmstate.c | 9 +++++----
|
|
2 files changed, 10 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/docs/migration.txt b/docs/migration.txt
|
|
index 0e0a1d4..fe1f2bb 100644
|
|
--- a/docs/migration.txt
|
|
+++ b/docs/migration.txt
|
|
@@ -139,7 +139,6 @@ static const VMStateDescription vmstate_kbd = {
|
|
.name = "pckbd",
|
|
.version_id = 3,
|
|
.minimum_version_id = 3,
|
|
- .minimum_version_id_old = 3,
|
|
.fields = (VMStateField []) {
|
|
VMSTATE_UINT8(write_cmd, KBDState),
|
|
VMSTATE_UINT8(status, KBDState),
|
|
@@ -168,12 +167,13 @@ You can see that there are several version fields:
|
|
- minimum_version_id: the minimum version_id that VMState is able to understand
|
|
for that device.
|
|
- minimum_version_id_old: For devices that were not able to port to vmstate, we can
|
|
- assign a function that knows how to read this old state.
|
|
+ assign a function that knows how to read this old state. This field is
|
|
+ ignored if there is no load_state_old handler.
|
|
|
|
So, VMState is able to read versions from minimum_version_id to
|
|
-version_id. And the function load_state_old() is able to load state
|
|
-from minimum_version_id_old to minimum_version_id. This function is
|
|
-deprecated and will be removed when no more users are left.
|
|
+version_id. And the function load_state_old() (if present) is able to
|
|
+load state from minimum_version_id_old to minimum_version_id. This
|
|
+function is deprecated and will be removed when no more users are left.
|
|
|
|
=== Massaging functions ===
|
|
|
|
@@ -255,7 +255,6 @@ const VMStateDescription vmstate_ide_drive_pio_state = {
|
|
.name = "ide_drive/pio_state",
|
|
.version_id = 1,
|
|
.minimum_version_id = 1,
|
|
- .minimum_version_id_old = 1,
|
|
.pre_save = ide_drive_pio_pre_save,
|
|
.post_load = ide_drive_pio_post_load,
|
|
.fields = (VMStateField []) {
|
|
@@ -275,7 +274,6 @@ const VMStateDescription vmstate_ide_drive = {
|
|
.name = "ide_drive",
|
|
.version_id = 3,
|
|
.minimum_version_id = 0,
|
|
- .minimum_version_id_old = 0,
|
|
.post_load = ide_drive_post_load,
|
|
.fields = (VMStateField []) {
|
|
.... several fields ....
|
|
diff --git a/vmstate.c b/vmstate.c
|
|
index 105f184..582c321 100644
|
|
--- a/vmstate.c
|
|
+++ b/vmstate.c
|
|
@@ -19,11 +19,12 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,
|
|
if (version_id > vmsd->version_id) {
|
|
return -EINVAL;
|
|
}
|
|
- if (version_id < vmsd->minimum_version_id_old) {
|
|
- return -EINVAL;
|
|
- }
|
|
if (version_id < vmsd->minimum_version_id) {
|
|
- return vmsd->load_state_old(f, opaque, version_id);
|
|
+ if (vmsd->load_state_old &&
|
|
+ version_id >= vmsd->minimum_version_id_old) {
|
|
+ return vmsd->load_state_old(f, opaque, version_id);
|
|
+ }
|
|
+ return -EINVAL;
|
|
}
|
|
if (vmsd->pre_load) {
|
|
int ret = vmsd->pre_load(opaque);
|