[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/48] linux-user/elfload: Avoid leaking interp_name using GLib me
From: |
Peter Maydell |
Subject: |
[PULL 04/48] linux-user/elfload: Avoid leaking interp_name using GLib memory API |
Date: |
Tue, 27 Oct 2020 11:43:54 +0000 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Fix an unlikely memory leak in load_elf_image().
Fixes: bf858897b7 ("linux-user: Re-use load_elf_image for the main binary.")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20201021173749.111103-5-richard.henderson@linaro.org
Message-Id: <20201003174944.1972444-1-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
linux-user/elfload.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index f6022fd7049..1a3150df7c0 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2584,13 +2584,13 @@ static void load_elf_image(const char *image_name, int
image_fd,
info->brk = vaddr_em;
}
} else if (eppnt->p_type == PT_INTERP && pinterp_name) {
- char *interp_name;
+ g_autofree char *interp_name = NULL;
if (*pinterp_name) {
errmsg = "Multiple PT_INTERP entries";
goto exit_errmsg;
}
- interp_name = malloc(eppnt->p_filesz);
+ interp_name = g_malloc(eppnt->p_filesz);
if (!interp_name) {
goto exit_perror;
}
@@ -2609,7 +2609,7 @@ static void load_elf_image(const char *image_name, int
image_fd,
errmsg = "Invalid PT_INTERP entry";
goto exit_errmsg;
}
- *pinterp_name = interp_name;
+ *pinterp_name = g_steal_pointer(&interp_name);
#ifdef TARGET_MIPS
} else if (eppnt->p_type == PT_MIPS_ABIFLAGS) {
Mips_elf_abiflags_v0 abiflags;
@@ -2961,7 +2961,7 @@ int load_elf_binary(struct linux_binprm *bprm, struct
image_info *info)
if (elf_interpreter) {
info->load_bias = interp_info.load_bias;
info->entry = interp_info.entry;
- free(elf_interpreter);
+ g_free(elf_interpreter);
}
#ifdef USE_ELF_CORE_DUMP
--
2.20.1
- [PULL 00/48] target-arm queue, Peter Maydell, 2020/10/27
- [PULL 01/48] linux-user/aarch64: Reset btype for signals, Peter Maydell, 2020/10/27
- [PULL 05/48] linux-user/elfload: Fix coding style in load_elf_image, Peter Maydell, 2020/10/27
- [PULL 10/48] linux-user/elfload: Parse NT_GNU_PROPERTY_TYPE_0 notes, Peter Maydell, 2020/10/27
- [PULL 08/48] linux-user/elfload: Use Error for load_elf_image, Peter Maydell, 2020/10/27
- [PULL 04/48] linux-user/elfload: Avoid leaking interp_name using GLib memory API,
Peter Maydell <=
- [PULL 02/48] linux-user: Set PAGE_TARGET_1 for TARGET_PROT_BTI, Peter Maydell, 2020/10/27
- [PULL 09/48] linux-user/elfload: Use Error for load_elf_interp, Peter Maydell, 2020/10/27
- [PULL 03/48] include/elf: Add defines related to GNU property notes for AArch64, Peter Maydell, 2020/10/27
- [PULL 06/48] linux-user/elfload: Adjust iteration over phdr, Peter Maydell, 2020/10/27
- [PULL 07/48] linux-user/elfload: Move PT_INTERP detection to first loop, Peter Maydell, 2020/10/27
- [PULL 13/48] hw/arm/highbank: Silence warnings about missing fallthrough statements, Peter Maydell, 2020/10/27
- [PULL 14/48] hw/arm: fix min_cpus for xlnx-versal-virt platform, Peter Maydell, 2020/10/27
- [PULL 15/48] Move npcm7xx_timer_reached_zero call out of npcm7xx_timer_pause, Peter Maydell, 2020/10/27
- [PULL 17/48] hw/misc: Add npcm7xx random number generator, Peter Maydell, 2020/10/27
- [PULL 16/48] hw/timer: Adding watchdog for NPCM7XX Timer., Peter Maydell, 2020/10/27