Commit 3ac24188 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland
Browse files

sun4u: ensure kernel_top is always initialised 



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: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
parent d0092d90

hw/sparc64/sun4u.c

+2 −2
Original line number Diff line number Diff line
@@ -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,