diff options
Diffstat (limited to 'meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch')
| -rw-r--r-- | meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch b/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch new file mode 100644 index 0000000000..57e4b3890a --- /dev/null +++ b/meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch @@ -0,0 +1,43 @@ +From 19d9e9d838e74e4a0a22f08ae03167380f8aa490 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 16 Aug 2018 09:58:26 +0800 +Subject: [PATCH] libelf/elf_end.c: check data_list.data.d.d_buf before free it + +The one which actually saves the data is data_list.data.d.d_buf, so check it +before free rawdata_base. + +This can fix a segmentation fault when prelink libqb_1.0.3: +prelink: /usr/lib/libqb.so.0.18.2: Symbol section index outside of section numbers + +The segmentation fault happens when prelink call elf_end(). + +Upstream-Status: Submitted [https://sourceware.org/ml/elfutils-devel/2018-q3/msg00085.html] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + libelf/elf_end.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libelf/elf_end.c b/libelf/elf_end.c +index 80f4d13..b103959 100644 +--- a/libelf/elf_end.c ++++ b/libelf/elf_end.c +@@ -169,14 +169,16 @@ elf_end (Elf *elf) + architecture doesn't require overly stringent + alignment the raw data buffer is the same as the + one used for presenting to the caller. */ +- if (scn->data_base != scn->rawdata_base) ++ if ((scn->data_base != scn->rawdata_base) ++ && (scn->data_list.data.d.d_buf != NULL)) + free (scn->data_base); + + /* The section data is allocated if we couldn't mmap + the file. Or if we had to decompress. */ +- if (elf->map_address == NULL ++ if ((elf->map_address == NULL + || scn->rawdata_base == scn->zdata_base + || (scn->flags & ELF_F_MALLOCED) != 0) ++ && (scn->data_list.data.d.d_buf != NULL)) + free (scn->rawdata_base); + + /* Free the list of data buffers for the section. |