Skip to contentSkip to conversation

pc: fix segfault introduced by 3d53f5c36ff6

PATCH In review Eduard - Gabriel Munteanu 3 participants 3 messages May 20, 2010 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pc: fix segfault introduced by 3d53f5c36ff6

Commit 3d53f5c36ff6 introduced a segfault by erroneously making fw_cfg a 'void **' and passing it around in different ways.

---
 hw/pc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
hw/pc.c +2 -2
index fee08c9..4a4a706 100644
@@ -822,7 +822,7 @@ void pc_memory_init(ram_addr_t ram_size,
     ram_addr_t ram_addr, bios_offset, option_rom_offset;
     ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
     int bios_size, isa_bios_size;
-    void **fw_cfg;
+    void *fw_cfg;
 
     if (ram_size >= 0xe0000000 ) {
         above_4g_mem_size = ram_size - 0xe0000000;
@@ -905,7 +905,7 @@ void pc_memory_init(ram_addr_t ram_size,
     rom_set_fw(fw_cfg);
 
     if (linux_boot) {
-        load_linux(*fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
+        load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
     }
 
     for (i = 0; i < nb_option_roms; i++) {
Signature · 1 line
1.6.4.4
Acked-by on v1 1/1
#1 lore raw

Thank you for fixing it. Probably I was too in hurry when rebasing the patches.

Quoted 34 lines · Eduard - Gabriel Munteanu

Commit 3d53f5c36ff6 introduced a segfault by erroneously making fw_cfg a 'void **' and passing it around in different ways.

---
 hw/pc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
hw/pc.c +2 -2
index fee08c9..4a4a706 100644
@@ -822,7 +822,7 @@ void pc_memory_init(ram_addr_t ram_size,
     ram_addr_t ram_addr, bios_offset, option_rom_offset;
     ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
     int bios_size, isa_bios_size;
-    void **fw_cfg;
+    void *fw_cfg;
 
     if (ram_size >= 0xe0000000 ) {
         above_4g_mem_size = ram_size - 0xe0000000;
@@ -905,7 +905,7 @@ void pc_memory_init(ram_addr_t ram_size,
     rom_set_fw(fw_cfg);
 
     if (linux_boot) {
-        load_linux(*fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
+        load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
     }
 
     for (i = 0; i < nb_option_roms; i++) {
Signature · 1 line
1.6.4.4
Signature · 1 line
yamahata
#2 lore raw
In reply to Eduard - Gabriel Munteanu

Good catch. Thanks, applied.

Quoted 34 lines · Eduard - Gabriel Munteanu

Commit 3d53f5c36ff6 introduced a segfault by erroneously making fw_cfg a 'void **' and passing it around in different ways.

---
 hw/pc.c |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)
hw/pc.c +2 -3
index fee08c9..4a4a706 100644
@@ -822,7 +822,7 @@ void pc_memory_init(ram_addr_t ram_size,
     ram_addr_t ram_addr, bios_offset, option_rom_offset;
     ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
     int bios_size, isa_bios_size;
-    void **fw_cfg;
+    void *fw_cfg;
 
     if (ram_size >= 0xe0000000 ) {
         above_4g_mem_size = ram_size - 0xe0000000;
@@ -905,7 +905,7 @@ void pc_memory_init(ram_addr_t ram_size,
     rom_set_fw(fw_cfg);
 
     if (linux_boot) {
-        load_linux(*fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
+        load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
     }
 
     for (i = 0; i < nb_option_roms; i++) {
--

1.6.4.4