| Message ID | 20180810112323.25206-1-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | sun4u: ensure kernel_top is always initialised | expand |
On 08/10/2018 01:23 PM, Mark Cave-Ayland wrote: > Valgrind reports that when loading a non-ELF kernel, kernel_top may be used > uninitialised when checking for an initrd. > > Since there are no known non-ELF kernels for SPARC64 then we can simply > initialise kernel_top to 0 and then skip the initrd load process if it hasn't > been set by load_elf(). > > Reported-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/sparc64/sun4u.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c > index 74b748497e..d16843b30e 100644 > --- a/hw/sparc64/sun4u.c > +++ b/hw/sparc64/sun4u.c > @@ -139,7 +139,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, > unsigned int i; > long kernel_size; > uint8_t *ptr; > - uint64_t kernel_top; > + uint64_t kernel_top = 0; > > linux_boot = (kernel_filename != NULL); > > @@ -172,7 +172,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, > } > /* load initrd above kernel */ > *initrd_size = 0; > - if (initrd_filename) { > + if (initrd_filename && kernel_top) { > *initrd_addr = TARGET_PAGE_ALIGN(kernel_top); > > *initrd_size = load_image_targphys(initrd_filename, > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 74b748497e..d16843b30e 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -139,7 +139,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, unsigned int i; long kernel_size; uint8_t *ptr; - uint64_t kernel_top; + uint64_t kernel_top = 0; linux_boot = (kernel_filename != NULL); @@ -172,7 +172,7 @@ static uint64_t sun4u_load_kernel(const char *kernel_filename, } /* load initrd above kernel */ *initrd_size = 0; - if (initrd_filename) { + if (initrd_filename && kernel_top) { *initrd_addr = TARGET_PAGE_ALIGN(kernel_top); *initrd_size = load_image_targphys(initrd_filename,
Valgrind reports that when loading a non-ELF kernel, kernel_top may be used uninitialised when checking for an initrd. Since there are no known non-ELF kernels for SPARC64 then we can simply initialise kernel_top to 0 and then skip the initrd load process if it hasn't been set by load_elf(). Reported-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/sparc64/sun4u.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)