hw/elf_ops: clear uninitialized segment space
When the mem_size of the segment is bigger than the file_size,
and if this space doesn't overlap another segment, it needs
to be cleared.
This bug is very similar to the one we had for linux-user,
22d113b52f
("linux-user: Fix loading of BSS segments"),
where .bss section is encoded as an extension of the the data
one by setting the segment p_memsz > p_filesz.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
[PMD: Use recently added address_space_set()]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220115203725.3834712-3-laurent@vivier.eu>
staging
parent
75f01c68b5
commit
b4c4c1f112
|
@ -1164,9 +1164,13 @@ static void rom_reset(void *unused)
|
||||||
if (rom->mr) {
|
if (rom->mr) {
|
||||||
void *host = memory_region_get_ram_ptr(rom->mr);
|
void *host = memory_region_get_ram_ptr(rom->mr);
|
||||||
memcpy(host, rom->data, rom->datasize);
|
memcpy(host, rom->data, rom->datasize);
|
||||||
|
memset(host + rom->datasize, 0, rom->romsize - rom->datasize);
|
||||||
} else {
|
} else {
|
||||||
address_space_write_rom(rom->as, rom->addr, MEMTXATTRS_UNSPECIFIED,
|
address_space_write_rom(rom->as, rom->addr, MEMTXATTRS_UNSPECIFIED,
|
||||||
rom->data, rom->datasize);
|
rom->data, rom->datasize);
|
||||||
|
address_space_set(rom->as, rom->addr + rom->datasize, 0,
|
||||||
|
rom->romsize - rom->datasize,
|
||||||
|
MEMTXATTRS_UNSPECIFIED);
|
||||||
}
|
}
|
||||||
if (rom->isrom) {
|
if (rom->isrom) {
|
||||||
/* rom needs to be written only once */
|
/* rom needs to be written only once */
|
||||||
|
|
|
@ -555,6 +555,19 @@ static ssize_t glue(load_elf, SZ)(const char *name, int fd,
|
||||||
if (res != MEMTX_OK) {
|
if (res != MEMTX_OK) {
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
* We need to zero'ify the space that is not copied
|
||||||
|
* from file
|
||||||
|
*/
|
||||||
|
if (file_size < mem_size) {
|
||||||
|
res = address_space_set(as ? as : &address_space_memory,
|
||||||
|
addr + file_size, 0,
|
||||||
|
mem_size - file_size,
|
||||||
|
MEMTXATTRS_UNSPECIFIED);
|
||||||
|
if (res != MEMTX_OK) {
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue