[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/13] i386: fix regression parsing multiboot initrd
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 10/13] i386: fix regression parsing multiboot initrd modules |
Date: |
Tue, 17 Jul 2018 17:06:52 +0200 |
From: Daniel P. Berrangé <address@hidden>
The logic for parsing the multiboot initrd modules was messed up in
commit 950c4e6c94b15cd0d8b63891dddd7a8dbf458e6a
Author: Daniel P. Berrangé <address@hidden>
Date: Mon Apr 16 12:17:43 2018 +0100
opts: don't silently truncate long option values
Causing the length to be undercounter, and the number of modules over
counted. It also passes NULL to get_opt_value() which was not robust
at accepting a NULL value.
Signed-off-by: Daniel P. Berrangé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Tested-by: Roman Kagan <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/i386/multiboot.c | 3 +--
util/qemu-option.c | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 7a2953e..8e26545 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -292,8 +292,7 @@ int load_multiboot(FWCfgState *fw_cfg,
cmdline_len += strlen(kernel_cmdline) + 1;
if (initrd_filename) {
const char *r = get_opt_value(initrd_filename, NULL);
- cmdline_len += strlen(r) + 1;
- mbs.mb_mods_avail = 1;
+ cmdline_len += strlen(initrd_filename) + 1;
while (1) {
mbs.mb_mods_avail++;
r = get_opt_value(r, NULL);
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 19761e3..834217f 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -75,7 +75,9 @@ const char *get_opt_value(const char *p, char **value)
size_t capacity = 0, length;
const char *offset;
- *value = NULL;
+ if (value) {
+ *value = NULL;
+ }
while (1) {
offset = qemu_strchrnul(p, ',');
length = offset - p;
--
1.8.3.1
- [Qemu-devel] [PULL 01/13] dump: add kernel_gs_base to QEMU CPU state, (continued)
- [Qemu-devel] [PULL 01/13] dump: add kernel_gs_base to QEMU CPU state, Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 03/13] hyperv: rename vcpu_id to vp_index, Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 02/13] accel: Fix typo and grammar in comment, Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 06/13] PC Chipset: Improve serial divisor calculation, Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 05/13] vhost-user-test: added proper TestServer *dest initialization in test_migrate(), Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 04/13] hyperv: ensure VP index equal to QEMU cpu_index, Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 07/13] hw/char/serial: retry write if EAGAIN, Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 09/13] virtio-scsi: fix hotplug ->reset() vs event race, Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 12/13] opts: remove redundant check for NULL parameter, Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 08/13] qdev: add HotplugHandler->post_plug() callback, Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 10/13] i386: fix regression parsing multiboot initrd modules,
Paolo Bonzini <=
- [Qemu-devel] [PULL 11/13] i386: only parse the initrd_filename once for multiboot modules, Paolo Bonzini, 2018/07/17
- [Qemu-devel] [PULL 13/13] Document command line options with single dash, Paolo Bonzini, 2018/07/17
- Re: [Qemu-devel] [PULL 00/13] Misc fixes for QEMU 3.0.0-rc1, Peter Maydell, 2018/07/17