From 0dd5ce38fbeb2fb97b01cc8c1c97292211e48ee6 Mon Sep 17 00:00:00 2001 From: Martijn van den Broek Date: Tue, 6 Aug 2013 20:45:39 +0200 Subject: Bugfix for loading multiboot kernels This patch fixes a bug in rom_copy introduced by commit d60fa42e8bae39440f997ebfe8fe328269a57d16. rom_copy failed to load roms with a "datasize" of 0. As a result, multiboot kernels were not loaded correctly when they contain a segment with a "file size" of 0. https://bugs.launchpad.net/qemu/+bug/1208944 Signed-off-by: Martijn van den Broek Reviewed-by: Paolo Bonzini Message-id: CAG1x_oET1u3TMPu3r_zzd3ZXsTWQLiaM0zAc+RkHFCwvJjGOvg@mail.gmail.com Signed-off-by: Anthony Liguori --- hw/core/loader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'hw/core/loader.c') diff --git a/hw/core/loader.c b/hw/core/loader.c index c3c28cf6af..6875b7ecf3 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -814,9 +814,6 @@ int rom_copy(uint8_t *dest, hwaddr addr, size_t size) if (rom->addr > end) { break; } - if (!rom->data) { - continue; - } d = dest + (rom->addr - addr); s = rom->data; @@ -826,7 +823,9 @@ int rom_copy(uint8_t *dest, hwaddr addr, size_t size) l = dest - d; } - memcpy(d, s, l); + if (l > 0) { + memcpy(d, s, l); + } if (rom->romsize > rom->datasize) { /* If datasize is less than romsize, it means that we didn't -- cgit v1.2.1