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
70 lines
3.0 KiB
Diff
70 lines
3.0 KiB
Diff
From 075764d38e7916de4f2621c329d3b7d810a76500 Mon Sep 17 00:00:00 2001
|
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Date: Thu, 3 Apr 2014 19:52:21 +0300
|
|
Subject: [PATCH] vmstate: s/VMSTATE_INT32_LE/VMSTATE_INT32_POSITIVE_LE/
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
As the macro verifies the value is positive, rename it
|
|
to make the function clearer.
|
|
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
(cherry picked from commit 3476436a44c29725efef0cabf5b3ea4e70054d57)
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
hw/pci/pci.c | 4 ++--
|
|
include/migration/vmstate.h | 2 +-
|
|
target-arm/machine.c | 2 +-
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
|
|
index 2a9f08e..517ff2a 100644
|
|
--- a/hw/pci/pci.c
|
|
+++ b/hw/pci/pci.c
|
|
@@ -475,7 +475,7 @@ const VMStateDescription vmstate_pci_device = {
|
|
.minimum_version_id = 1,
|
|
.minimum_version_id_old = 1,
|
|
.fields = (VMStateField []) {
|
|
- VMSTATE_INT32_LE(version_id, PCIDevice),
|
|
+ VMSTATE_INT32_POSITIVE_LE(version_id, PCIDevice),
|
|
VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0,
|
|
vmstate_info_pci_config,
|
|
PCI_CONFIG_SPACE_SIZE),
|
|
@@ -492,7 +492,7 @@ const VMStateDescription vmstate_pcie_device = {
|
|
.minimum_version_id = 1,
|
|
.minimum_version_id_old = 1,
|
|
.fields = (VMStateField []) {
|
|
- VMSTATE_INT32_LE(version_id, PCIDevice),
|
|
+ VMSTATE_INT32_POSITIVE_LE(version_id, PCIDevice),
|
|
VMSTATE_BUFFER_UNSAFE_INFO(config, PCIDevice, 0,
|
|
vmstate_info_pci_config,
|
|
PCIE_CONFIG_SPACE_SIZE),
|
|
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
|
|
index 5b71370..7e45048 100644
|
|
--- a/include/migration/vmstate.h
|
|
+++ b/include/migration/vmstate.h
|
|
@@ -601,7 +601,7 @@ extern const VMStateInfo vmstate_info_bitmap;
|
|
#define VMSTATE_UINT64_EQUAL(_f, _s) \
|
|
VMSTATE_UINT64_EQUAL_V(_f, _s, 0)
|
|
|
|
-#define VMSTATE_INT32_LE(_f, _s) \
|
|
+#define VMSTATE_INT32_POSITIVE_LE(_f, _s) \
|
|
VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_le, int32_t)
|
|
|
|
#define VMSTATE_UINT8_TEST(_f, _s, _t) \
|
|
diff --git a/target-arm/machine.c b/target-arm/machine.c
|
|
index 7ced87a..5746ffd 100644
|
|
--- a/target-arm/machine.c
|
|
+++ b/target-arm/machine.c
|
|
@@ -246,7 +246,7 @@ const VMStateDescription vmstate_arm_cpu = {
|
|
/* The length-check must come before the arrays to avoid
|
|
* incoming data possibly overflowing the array.
|
|
*/
|
|
- VMSTATE_INT32_LE(cpreg_vmstate_array_len, ARMCPU),
|
|
+ VMSTATE_INT32_POSITIVE_LE(cpreg_vmstate_array_len, ARMCPU),
|
|
VMSTATE_VARRAY_INT32(cpreg_vmstate_indexes, ARMCPU,
|
|
cpreg_vmstate_array_len,
|
|
0, vmstate_info_uint64, uint64_t),
|