* [Qemu-devel] [PATCH] Bugfix for loading multiboot kernels
@ 2013-08-06 18:45 Martijn van den Broek
2013-08-07 7:44 ` [Qemu-devel] [PATCH for-1.6] " Paolo Bonzini
2013-08-14 16:27 ` [Qemu-devel] [PATCH] " Anthony Liguori
0 siblings, 2 replies; 3+ messages in thread
From: Martijn van den Broek @ 2013-08-06 18:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, agraf, chouteau
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 <martijn.vdbrk@gmail.com>
---
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 c3c28cf..6875b7e 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
--
1.8.1.msysgit.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH for-1.6] Bugfix for loading multiboot kernels
2013-08-06 18:45 [Qemu-devel] [PATCH] Bugfix for loading multiboot kernels Martijn van den Broek
@ 2013-08-07 7:44 ` Paolo Bonzini
2013-08-14 16:27 ` [Qemu-devel] [PATCH] " Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2013-08-07 7:44 UTC (permalink / raw)
To: Martijn van den Broek; +Cc: qemu-stable, qemu-devel, chouteau, agraf
----- Original Message -----
> From: "Martijn van den Broek" <martijn.vdbrk@gmail.com>
> To: qemu-devel@nongnu.org
> Cc: chouteau@adacore.com, pbonzini@redhat.com, agraf@suse.de
> Sent: Tuesday, August 6, 2013 8:45:39 PM
> Subject: [PATCH] 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 <martijn.vdbrk@gmail.com>
> ---
> 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 c3c28cf..6875b7e 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
> --
> 1.8.1.msysgit.1
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
and marking the patch for 1.5 and 1.6:
Cc: qemu-stable@nongnu.org
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] Bugfix for loading multiboot kernels
2013-08-06 18:45 [Qemu-devel] [PATCH] Bugfix for loading multiboot kernels Martijn van den Broek
2013-08-07 7:44 ` [Qemu-devel] [PATCH for-1.6] " Paolo Bonzini
@ 2013-08-14 16:27 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2013-08-14 16:27 UTC (permalink / raw)
To: Martijn van den Broek, qemu-devel; +Cc: pbonzini, agraf, chouteau, qemu-stable
Applied. Thanks.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-14 16:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-06 18:45 [Qemu-devel] [PATCH] Bugfix for loading multiboot kernels Martijn van den Broek
2013-08-07 7:44 ` [Qemu-devel] [PATCH for-1.6] " Paolo Bonzini
2013-08-14 16:27 ` [Qemu-devel] [PATCH] " Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).