|
 |
9ae3a8 |
From 3741ae811d3287e34779a307480dfb3e93dbb451 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 30 Jun 2014 09:49:51 +0200
|
|
|
9ae3a8 |
Subject: [PATCH] Allow mismatched virtio config-len
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1404121791-14438-2-git-send-email-dgilbert@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 59405
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/1] Allow mismatched virtio config-len
|
|
|
9ae3a8 |
Bugzilla: 1113009
|
|
|
9ae3a8 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Commit 'virtio: validate config_len on load' restricted config_len
|
|
|
9ae3a8 |
loaded from the wire to match the config_len that the device had.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Unfortunately, there are cases where this isn't true, the one
|
|
|
9ae3a8 |
we found it on was the wce addition in virtio-blk.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Allow mismatched config-lengths:
|
|
|
9ae3a8 |
*) If the version on the wire is shorter then fine
|
|
|
9ae3a8 |
*) If the version on the wire is longer, load what we have space
|
|
|
9ae3a8 |
for and skip the rest.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
(This is mst@redhat.com's rework of what I originally posted)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 2f5732e9648fcddc8759a8fd25c0b41a38352be6)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/virtio/virtio.c | 16 +++++++++++-----
|
|
|
9ae3a8 |
1 file changed, 11 insertions(+), 5 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/virtio/virtio.c | 16 +++++++++++-----
|
|
|
9ae3a8 |
1 files changed, 11 insertions(+), 5 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
|
|
9ae3a8 |
index 44309c2..132b5af 100644
|
|
|
9ae3a8 |
--- a/hw/virtio/virtio.c
|
|
|
9ae3a8 |
+++ b/hw/virtio/virtio.c
|
|
|
9ae3a8 |
@@ -886,12 +886,18 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f)
|
|
|
9ae3a8 |
return -1;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
config_len = qemu_get_be32(f);
|
|
|
9ae3a8 |
- if (config_len != vdev->config_len) {
|
|
|
9ae3a8 |
- error_report("Unexpected config length 0x%x. Expected 0x%zx",
|
|
|
9ae3a8 |
- config_len, vdev->config_len);
|
|
|
9ae3a8 |
- return -1;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ /*
|
|
|
9ae3a8 |
+ * There are cases where the incoming config can be bigger or smaller
|
|
|
9ae3a8 |
+ * than what we have; so load what we have space for, and skip
|
|
|
9ae3a8 |
+ * any excess that's in the stream.
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+ qemu_get_buffer(f, vdev->config, MIN(config_len, vdev->config_len));
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ while (config_len > vdev->config_len) {
|
|
|
9ae3a8 |
+ qemu_get_byte(f);
|
|
|
9ae3a8 |
+ config_len--;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
- qemu_get_buffer(f, vdev->config, vdev->config_len);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
num = qemu_get_be32(f);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|