From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V9GHP-0005yV-CP for qemu-devel@nongnu.org; Tue, 13 Aug 2013 11:13:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V9GHF-0004Go-Gq for qemu-devel@nongnu.org; Tue, 13 Aug 2013 11:13:03 -0400 Sender: fluxion From: Michael Roth Date: Tue, 13 Aug 2013 10:11:16 -0500 Message-Id: <1376406680-16302-53-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1376406680-16302-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1376406680-16302-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 52/56] Bugfix for loading multiboot kernels List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, qemu-stable@nongnu.org From: Martijn van den Broek 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 (cherry picked from commit 0dd5ce38fbeb2fb97b01cc8c1c97292211e48ee6) Signed-off-by: Michael Roth --- hw/core/loader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 7507914..8514eaf 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -779,9 +779,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; @@ -791,7 +788,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 -- 1.7.9.5