|
 |
016a62 |
From dc98e8dd5c4aad2f3c480a9513ffba89540dcf3f Mon Sep 17 00:00:00 2001
|
|
|
016a62 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
016a62 |
Date: Thu, 12 Sep 2019 13:05:01 +0100
|
|
|
016a62 |
Subject: [PATCH 04/22] i386: fix regression parsing multiboot initrd modules
|
|
|
016a62 |
MIME-Version: 1.0
|
|
|
016a62 |
Content-Type: text/plain; charset=UTF-8
|
|
|
016a62 |
Content-Transfer-Encoding: 8bit
|
|
|
016a62 |
|
|
|
016a62 |
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
|
|
016a62 |
Message-id: <20190912130503.14094-5-lersek@redhat.com>
|
|
|
016a62 |
Patchwork-id: 90434
|
|
|
016a62 |
O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 4/6] i386: fix regression parsing multiboot initrd modules
|
|
|
016a62 |
Bugzilla: 1749022
|
|
|
016a62 |
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
016a62 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
016a62 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
016a62 |
|
|
|
016a62 |
From: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
016a62 |
|
|
|
016a62 |
The logic for parsing the multiboot initrd modules was messed up in
|
|
|
016a62 |
|
|
|
016a62 |
commit 950c4e6c94b15cd0d8b63891dddd7a8dbf458e6a
|
|
|
016a62 |
Author: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
016a62 |
Date: Mon Apr 16 12:17:43 2018 +0100
|
|
|
016a62 |
|
|
|
016a62 |
opts: don't silently truncate long option values
|
|
|
016a62 |
|
|
|
016a62 |
Causing the length to be undercounter, and the number of modules over
|
|
|
016a62 |
counted. It also passes NULL to get_opt_value() which was not robust
|
|
|
016a62 |
at accepting a NULL value.
|
|
|
016a62 |
|
|
|
016a62 |
RHEL8 notes:
|
|
|
016a62 |
|
|
|
016a62 |
- Context difference in "util/qemu-option.c", function get_opt_value();
|
|
|
016a62 |
upstream has commit 5c99fa375da1 ("cutils: Provide strchrnul",
|
|
|
016a62 |
2018-06-29), part of v3.0.0, but downstream lacks it. Harmless, because
|
|
|
016a62 |
said upstream commit only refactors get_opt_value().
|
|
|
016a62 |
|
|
|
016a62 |
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
016a62 |
Message-Id: <20180514171913.17664-2-berrange@redhat.com>
|
|
|
016a62 |
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
016a62 |
Tested-by: Roman Kagan <rkagan@virtuozzo.com>
|
|
|
016a62 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
016a62 |
(cherry picked from commit 6e3ad3f0e31b8e31c6c0769d0f474bcd9673e0e5)
|
|
|
016a62 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
016a62 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
016a62 |
---
|
|
|
016a62 |
hw/i386/multiboot.c | 3 +--
|
|
|
016a62 |
util/qemu-option.c | 4 +++-
|
|
|
016a62 |
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
016a62 |
|
|
|
016a62 |
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
|
|
|
016a62 |
index 7a2953e..8e26545 100644
|
|
|
016a62 |
--- a/hw/i386/multiboot.c
|
|
|
016a62 |
+++ b/hw/i386/multiboot.c
|
|
|
016a62 |
@@ -292,8 +292,7 @@ int load_multiboot(FWCfgState *fw_cfg,
|
|
|
016a62 |
cmdline_len += strlen(kernel_cmdline) + 1;
|
|
|
016a62 |
if (initrd_filename) {
|
|
|
016a62 |
const char *r = get_opt_value(initrd_filename, NULL);
|
|
|
016a62 |
- cmdline_len += strlen(r) + 1;
|
|
|
016a62 |
- mbs.mb_mods_avail = 1;
|
|
|
016a62 |
+ cmdline_len += strlen(initrd_filename) + 1;
|
|
|
016a62 |
while (1) {
|
|
|
016a62 |
mbs.mb_mods_avail++;
|
|
|
016a62 |
r = get_opt_value(r, NULL);
|
|
|
016a62 |
diff --git a/util/qemu-option.c b/util/qemu-option.c
|
|
|
016a62 |
index ba44a08..a396d60 100644
|
|
|
016a62 |
--- a/util/qemu-option.c
|
|
|
016a62 |
+++ b/util/qemu-option.c
|
|
|
016a62 |
@@ -75,7 +75,9 @@ const char *get_opt_value(const char *p, char **value)
|
|
|
016a62 |
size_t capacity = 0, length;
|
|
|
016a62 |
const char *offset;
|
|
|
016a62 |
|
|
|
016a62 |
- *value = NULL;
|
|
|
016a62 |
+ if (value) {
|
|
|
016a62 |
+ *value = NULL;
|
|
|
016a62 |
+ }
|
|
|
016a62 |
while (1) {
|
|
|
016a62 |
offset = strchr(p, ',');
|
|
|
016a62 |
if (!offset) {
|
|
|
016a62 |
--
|
|
|
016a62 |
1.8.3.1
|
|
|
016a62 |
|