OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

multiboot: copy the cmdline verbatim, unescape module strings

Browse Source 
get_opt_value() truncates the value at the first comma
Use memcpy() instead so that -append works correctly in the
presence of commas.  For -initrd to work right, instead,
unescape the module filename and parameters with get_opt_value()
before calling mb_add_cmdline().

Signed-off-by: Vlad Lungu <vlad.lungu@windriver.com>
Message-Id: <1481805124-16242-1-git-send-email-vlad.lungu@windriver.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Vlad Lungu 2016-12-15 14:32:04 +02:00 committed by Paolo Bonzini
parent e3592bc9d8
commit 96a3d39277
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/i386/multiboot.c
View File

@ -109,7 +109,7 @@ static uint32_t mb_add_cmdline(MultibootState *s, const char *cmdline)
hwaddr p = s->offset_cmdlines; hwaddr p = s->offset_cmdlines;
char *b = (char *)s->mb_buf + p; char *b = (char *)s->mb_buf + p;
get_opt_value(b, strlen(cmdline) + 1, cmdline); memcpy(b, cmdline, strlen(cmdline) + 1);
s->offset_cmdlines += strlen(b) + 1; s->offset_cmdlines += strlen(b) + 1;
return s->mb_buf_phys + p; return s->mb_buf_phys + p;
} }
@ -287,7 +287,8 @@ int load_multiboot(FWCfgState *fw_cfg,
mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len; mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len;
if (initrd_filename) { if (initrd_filename) {
char *next_initrd, not_last; const char *next_initrd;
char not_last, tmpbuf[strlen(initrd_filename) + 1];
mbs.offset_mods = mbs.mb_buf_size; mbs.offset_mods = mbs.mb_buf_size;
@ -296,25 +297,24 @@ int load_multiboot(FWCfgState *fw_cfg,
int mb_mod_length; int mb_mod_length;
uint32_t offs = mbs.mb_buf_size; uint32_t offs = mbs.mb_buf_size;
next_initrd = (char *)get_opt_value(NULL, 0, initrd_filename); next_initrd = get_opt_value(tmpbuf, sizeof(tmpbuf), initrd_filename);
not_last = *next_initrd; not_last = *next_initrd;
*next_initrd = '\0';
/* if a space comes after the module filename, treat everything /* if a space comes after the module filename, treat everything
after that as parameters */ after that as parameters */
hwaddr c = mb_add_cmdline(&mbs, initrd_filename); hwaddr c = mb_add_cmdline(&mbs, tmpbuf);
if ((next_space = strchr(initrd_filename, ' '))) if ((next_space = strchr(tmpbuf, ' ')))
*next_space = '\0'; *next_space = '\0';
mb_debug("multiboot loading module: %s\n", initrd_filename); mb_debug("multiboot loading module: %s\n", tmpbuf);
mb_mod_length = get_image_size(initrd_filename); mb_mod_length = get_image_size(tmpbuf);
if (mb_mod_length < 0) { if (mb_mod_length < 0) {
fprintf(stderr, "Failed to open file '%s'\n", initrd_filename); fprintf(stderr, "Failed to open file '%s'\n", tmpbuf);
exit(1); exit(1);
} }
mbs.mb_buf_size = TARGET_PAGE_ALIGN(mb_mod_length + mbs.mb_buf_size); mbs.mb_buf_size = TARGET_PAGE_ALIGN(mb_mod_length + mbs.mb_buf_size);
mbs.mb_buf = g_realloc(mbs.mb_buf, mbs.mb_buf_size); mbs.mb_buf = g_realloc(mbs.mb_buf, mbs.mb_buf_size);
load_image(initrd_filename, (unsigned char *)mbs.mb_buf + offs); load_image(tmpbuf, (unsigned char *)mbs.mb_buf + offs);
mb_add_mod(&mbs, mbs.mb_buf_phys + offs, mb_add_mod(&mbs, mbs.mb_buf_phys + offs,
mbs.mb_buf_phys + offs + mb_mod_length, c); mbs.mb_buf_phys + offs + mb_mod_length, c);