Le 15/04/2021 à 12:04, Philippe Mathieu-Daudé a écrit :
> From: Laurent Vivier <laur...@vivier.eu>
>
> 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,
> 22d113b52f41 ("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 <laur...@vivier.eu>
> Message-Id: <20210414105838.205019-1-laur...@vivier.eu>
> [PMD: Use recently added address_space_set()]
I agree that is a better way to do.
thanks,
Laurent
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> include/hw/elf_ops.h | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
> index 6ee458e7bc3..29f4c43e231 100644
> --- a/include/hw/elf_ops.h
> +++ b/include/hw/elf_ops.h
> @@ -562,6 +562,19 @@ static int glue(load_elf, SZ)(const char *name, int fd,
> if (res != MEMTX_OK) {
> 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;
> + }
> + }
> }
> }
>
>
