[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/19] multiboot: Fix offset of bootloader name
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/19] multiboot: Fix offset of bootloader name |
Date: |
Mon, 26 Jan 2015 10:24:14 +0100 |
From: Kevin Wolf <address@hidden>
This fixes a bug introduced in commit 5eba5a66 ('Add bootloader name to
multiboot implementation').
The calculation of the bootloader name offset didn't consider space
occupied by module command lines, so some unlucky module got its command
line partially overwritten with a "qemu" string.
Signed-off-by: Kevin Wolf <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/i386/multiboot.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index f86d351..1adbe9e 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -156,6 +156,7 @@ int load_multiboot(FWCfgState *fw_cfg,
MultibootState mbs;
uint8_t bootinfo[MBI_SIZE];
uint8_t *mb_bootinfo_data;
+ uint32_t cmdline_len;
/* Ok, let's see if it is a multiboot image.
The header is 12x32bit long, so the latest entry may be 8192 - 48. */
@@ -258,27 +259,28 @@ int load_multiboot(FWCfgState *fw_cfg,
mbs.offset_mbinfo = mbs.mb_buf_size;
/* Calculate space for cmdlines, bootloader name, and mb_mods */
- mbs.mb_buf_size += strlen(kernel_filename) + 1;
- mbs.mb_buf_size += strlen(kernel_cmdline) + 1;
- mbs.mb_buf_size += strlen(bootloader_name) + 1;
+ cmdline_len = strlen(kernel_filename) + 1;
+ cmdline_len += strlen(kernel_cmdline) + 1;
if (initrd_filename) {
const char *r = initrd_filename;
- mbs.mb_buf_size += strlen(r) + 1;
+ cmdline_len += strlen(r) + 1;
mbs.mb_mods_avail = 1;
while (*(r = get_opt_value(NULL, 0, r))) {
mbs.mb_mods_avail++;
r++;
}
- mbs.mb_buf_size += MB_MOD_SIZE * mbs.mb_mods_avail;
}
+ mbs.mb_buf_size += cmdline_len;
+ mbs.mb_buf_size += MB_MOD_SIZE * mbs.mb_mods_avail;
+ mbs.mb_buf_size += strlen(bootloader_name) + 1;
+
mbs.mb_buf_size = TARGET_PAGE_ALIGN(mbs.mb_buf_size);
/* enlarge mb_buf to hold cmdlines, bootloader, mb-info structs */
mbs.mb_buf = g_realloc(mbs.mb_buf, mbs.mb_buf_size);
mbs.offset_cmdlines = mbs.offset_mbinfo + mbs.mb_mods_avail *
MB_MOD_SIZE;
- mbs.offset_bootloader = mbs.offset_cmdlines + strlen(kernel_filename) + 1
- + strlen(kernel_cmdline) + 1;
+ mbs.offset_bootloader = mbs.offset_cmdlines + cmdline_len;
if (initrd_filename) {
char *next_initrd, not_last;
--
1.8.3.1
- [Qemu-devel] [PULL 00/19] i386, KVM, misc changes for 2015-01-26, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 03/19] multiboot: Fix offset of bootloader name,
Paolo Bonzini <=
- [Qemu-devel] [PULL 04/19] tests/multiboot: Add test for modules, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 05/19] target-i386: use vmstate_offset_sub_array for AVX registers, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 06/19] target-i386: make xmm_regs 512-bit wide, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 01/19] pc: fix KVM features in pc-1.3 and earlier machine types, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 07/19] qemu-timer: add timer_init and timer_init_ns/us/ms, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 09/19] vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR*, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 02/19] tests/multiboot: Update reference output, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 11/19] kvm_stat: Add aarch64 support, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 14/19] apic: do not dereference pointer before it is checked for NULL, Paolo Bonzini, 2015/01/26
- [Qemu-devel] [PULL 10/19] hw: misc, add educational driver, Paolo Bonzini, 2015/01/26