elf_ops: Don't try to g_mapped_file_unref(NULL)
PATCH 1/1 elf_ops: Don't try to g_mapped_file_unref(NULL)
Calling g_mapped_file_unref() on a NULL pointer is not valid, and glib will assert if you try it.
$ qemu-system-arm -M virt -display none -device loader,file=/tmp/bad.elf qemu-system-arm: -device loader,file=/tmp/bad.elf: GLib: g_mapped_file_unref: assertion 'file != NULL' failed
(One way to produce an ELF file that fails like this is to copy just the first 16 bytes of a valid ELF file; this is sufficient to fool the code in load_elf_ram_sym() into thinking it's an ELF file and calling load_elf32() or load_elf64().)
The failure-exit path in load_elf can be reached from various points in execution, and for some of those we haven't yet called g_mapped_file_new_from_fd(). Add a condition to the unref call so we only call it if we successfully created the GMappedFile to start with.
This will fix the assertion; for the specific case of the generic loader it will then fall back from "guess this is an ELF file" to "maybe it's a uImage or a hex file" and eventually to "just load as a raw data file".
--- include/hw/elf_ops.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/hw/elf_ops.h +3 -1
@@ -606,7 +606,9 @@ static int glue(load_elf, SZ)(const char *name, int fd, *highaddr = (uint64_t )(elf_sword )high; ret = total_size; fail: -g_mapped_file_unref (mapped_file); +if (mapped_file) { +g_mapped_file_unref (mapped_file); + }g_free (phdr);return ret; }
Signature · 1 line
2.20.1
Quoted 16 lines · Peter Maydell
Calling
g_mapped_file_unref()on a NULL pointer is not valid, and glib will assert if you try it.$ qemu-system-arm -M virt -display none -device loader,file=/tmp/bad.elf qemu-system-arm: -device loader,file=/tmp/bad.elf: GLib: g_mapped_file_unref: assertion 'file != NULL' failed(One way to produce an ELF file that fails like this is to copy just the first 16 bytes of a valid ELF file; this is sufficient to fool the code in
load_elf_ram_sym()into thinking it's an ELF file and callingload_elf32()orload_elf64().)The failure-exit path in
load_elfcan be reached from various points in execution, and for some of those we haven't yet calledg_mapped_file_new_from_fd(). Add a condition to the unref call so we only call it if we successfully created the GMappedFile to start with.
Quoted 7 lines
This will fix the assertion; for the specific case of the generic loader it will then fall back from "guess this is an ELF file" to "maybe it's a uImage or a hex file" and eventually to "just load as a raw data file".
Reported-by Randy Yates <[email protected]>Signed-off-by Peter Maydell <[email protected]>
Quoted 20 lines
--- include/hw/elf_ops.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)include/hw/elf_ops.h +3
-1@@ -606,7 +606,9 @@ static int glue(load_elf, SZ)(const char *name, int fd, *highaddr = (uint64_t )(elf_sword )high; ret = total_size; fail: -g_mapped_file_unref (mapped_file); +if (mapped_file) { +g_mapped_file_unref (mapped_file); + }g_free (phdr);return ret; }
Quoted 8 lines · Philippe Mathieu-Daudé
Quoted 4 lines · Peter Maydell
This will fix the assertion; for the specific case of the generic loader it will then fall back from "guess this is an ELF file" to "maybe it's a uImage or a hex file" and eventually to "just load as a raw data file".
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Thanks; as a side note "let me just load this as a raw data file" is not a very user-friendly way to report issues with the ELF file like "seems to be truncated" or "has no program headers". Not sure what to do about that...
thanks
-- PMM
Quoted 32 lines · Peter Maydell
Calling
g_mapped_file_unref()on a NULL pointer is not valid, and glib will assert if you try it.$ qemu-system-arm -M virt -display none -device loader,file=/tmp/bad.elf qemu-system-arm: -device loader,file=/tmp/bad.elf: GLib: g_mapped_file_unref: assertion 'file != NULL' failed(One way to produce an ELF file that fails like this is to copy just the first 16 bytes of a valid ELF file; this is sufficient to fool the code in
load_elf_ram_sym()into thinking it's an ELF file and callingload_elf32()orload_elf64().)The failure-exit path in
load_elfcan be reached from various points in execution, and for some of those we haven't yet calledg_mapped_file_new_from_fd(). Add a condition to the unref call so we only call it if we successfully created the GMappedFile to start with.This will fix the assertion; for the specific case of the generic loader it will then fall back from "guess this is an ELF file" to "maybe it's a uImage or a hex file" and eventually to "just load as a raw data file".
Reported-by Randy Yates <[email protected]>Signed-off-by Peter Maydell <[email protected]>--- include/hw/elf_ops.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)include/hw/elf_ops.h +0
-0
include/hw/elf_ops.h static int glue(load_elf, SZ)(const char *name, int fd, · line 614
Quoted 10 lines
include/hw/elf_ops.h +3
-1@@ -606,7 +606,9 @@ static int glue(load_elf, SZ)(const char *name, int fd, *highaddr = (uint64_t )(elf_sword )high; ret = total_size; fail: -g_mapped_file_unref (mapped_file); +if (mapped_file) { +g_mapped_file_unref (mapped_file); + }g_free (phdr);return ret; }
Oooops, my fault :-(
Maybe we can add:
Thanks,
Stefano
Laurent Vivier
AppliedLe 23/04/2020 à 22:20, Peter Maydell a écrit :
Quoted 33 lines
Calling
g_mapped_file_unref()on a NULL pointer is not valid, and glib will assert if you try it.$ qemu-system-arm -M virt -display none -device loader,file=/tmp/bad.elf qemu-system-arm: -device loader,file=/tmp/bad.elf: GLib: g_mapped_file_unref: assertion 'file != NULL' failed(One way to produce an ELF file that fails like this is to copy just the first 16 bytes of a valid ELF file; this is sufficient to fool the code in
load_elf_ram_sym()into thinking it's an ELF file and callingload_elf32()orload_elf64().)The failure-exit path in
load_elfcan be reached from various points in execution, and for some of those we haven't yet calledg_mapped_file_new_from_fd(). Add a condition to the unref call so we only call it if we successfully created the GMappedFile to start with.This will fix the assertion; for the specific case of the generic loader it will then fall back from "guess this is an ELF file" to "maybe it's a uImage or a hex file" and eventually to "just load as a raw data file".
Reported-by Randy Yates <[email protected]>Signed-off-by Peter Maydell <[email protected]>--- include/hw/elf_ops.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)include/hw/elf_ops.h +0
-0
include/hw/elf_ops.h static int glue(load_elf, SZ)(const char *name, int fd, · line 614
Quoted 10 lines
include/hw/elf_ops.h +3
-1@@ -606,7 +606,9 @@ static int glue(load_elf, SZ)(const char *name, int fd, *highaddr = (uint64_t )(elf_sword )high; ret = total_size; fail: -g_mapped_file_unref (mapped_file); +if (mapped_file) { +g_mapped_file_unref (mapped_file); + }g_free (phdr);return ret; }
Applied to my trivial-patches branch.
Thanks,
Laurent