[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v11 04/12] linux-user/elfload: Avoid leaking interp_name using GL
From: |
Richard Henderson |
Subject: |
[PATCH v11 04/12] linux-user/elfload: Avoid leaking interp_name using GLib memory API |
Date: |
Fri, 16 Oct 2020 11:41:59 -0700 |
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>
Message-Id: <20201003174944.1972444-1-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@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 f6022fd704..1a3150df7c 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.25.1
- [PATCH v11 00/12] linux-user: User support for AArch64 BTI, Richard Henderson, 2020/10/16
- [PATCH v11 01/12] linux-user/aarch64: Reset btype for signals, Richard Henderson, 2020/10/16
- [PATCH v11 02/12] linux-user: Set PAGE_TARGET_1 for TARGET_PROT_BTI, Richard Henderson, 2020/10/16
- [PATCH v11 03/12] include/elf: Add defines related to GNU property notes for AArch64, Richard Henderson, 2020/10/16
- [PATCH v11 05/12] linux-user/elfload: Fix coding style in load_elf_image, Richard Henderson, 2020/10/16
- [PATCH v11 10/12] linux-user/elfload: Parse NT_GNU_PROPERTY_TYPE_0 notes, Richard Henderson, 2020/10/16
- [PATCH v11 06/12] linux-user/elfload: Adjust iteration over phdr, Richard Henderson, 2020/10/16
- [PATCH v11 04/12] linux-user/elfload: Avoid leaking interp_name using GLib memory API,
Richard Henderson <=
- [PATCH v11 09/12] linux-user/elfload: Use Error for load_elf_interp, Richard Henderson, 2020/10/16
- [PATCH v11 08/12] linux-user/elfload: Use Error for load_elf_image, Richard Henderson, 2020/10/16
- [PATCH v11 07/12] linux-user/elfload: Move PT_INTERP detection to first loop, Richard Henderson, 2020/10/16
- [PATCH v11 12/12] tests/tcg/aarch64: Add bti smoke tests, Richard Henderson, 2020/10/16
- [PATCH v11 11/12] linux-user/elfload: Parse GNU_PROPERTY_AARCH64_FEATURE_1_AND, Richard Henderson, 2020/10/16
- Re: [PATCH v11 00/12] linux-user: User support for AArch64 BTI, no-reply, 2020/10/16
- Re: [PATCH v11 00/12] linux-user: User support for AArch64 BTI, Peter Maydell, 2020/10/20
- Re: [PATCH v11 00/12] linux-user: User support for AArch64 BTI, Peter Maydell, 2020/10/20