david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i386: fix regression parsing multiboot initrd modules

Browse Source 
The logic for parsing the multiboot initrd modules was messed up in

  commit 950c4e6c94b15cd0d8b63891dddd7a8dbf458e6a
  Author: Daniel P. Berrangé <berrange@redhat.com>
  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é <berrange@redhat.com>
Message-Id: <20180514171913.17664-2-berrange@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: Roman Kagan <rkagan@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-05-14 18:19:11 +01:00 committed by Paolo Bonzini
parent 8449bcf949
commit 6e3ad3f0e3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/i386/multiboot.c
View File

@ -292,8 +292,7 @@ int load_multiboot(FWCfgState *fw_cfg,
cmdline_len += strlen(kernel_cmdline) + 1; cmdline_len += strlen(kernel_cmdline) + 1;
if (initrd_filename) { if (initrd_filename) {
const char *r = get_opt_value(initrd_filename, NULL); const char *r = get_opt_value(initrd_filename, NULL);
cmdline_len += strlen(r) + 1; cmdline_len += strlen(initrd_filename) + 1;
mbs.mb_mods_avail = 1;
while (1) { while (1) {
mbs.mb_mods_avail++; mbs.mb_mods_avail++;
r = get_opt_value(r, NULL); r = get_opt_value(r, NULL);

2
util/qemu-option.c
View File

@ -75,7 +75,9 @@ const char *get_opt_value(const char *p, char **value)
size_t capacity = 0, length; size_t capacity = 0, length;
const char *offset; const char *offset;
if (value) {
*value = NULL; *value = NULL;
}
while (1) { while (1) {
offset = qemu_strchrnul(p, ','); offset = qemu_strchrnul(p, ',');
length = offset - p; length = offset - p;