diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2018-08-16 10:38:22 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-16 10:44:07 +0100 |
| commit | 560154e8525dce4beb8199ffc0d7c964da9d665a (patch) | |
| tree | a55511d6bca23c7c63511ec62ef9b623f7be1aeb | |
| parent | b7c291ee6532cba845ee6bfbbaa21076a2b2cbe5 (diff) | |
| download | openembedded-core-560154e8525dce4beb8199ffc0d7c964da9d665a.tar.gz openembedded-core-560154e8525dce4beb8199ffc0d7c964da9d665a.tar.bz2 openembedded-core-560154e8525dce4beb8199ffc0d7c964da9d665a.zip | |
elfutils: check data_list.data.d.d_buf before free it
[YOCTO #12791]
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().
Fixed:
MACHINE="qemux86-64"
IMAGE_INSTALL_append = " libqb" #libqp is from meta-openembedded
$ bitbake core-image-minimal
Segmention fault
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.172.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/elfutils/files/0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch | 39 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.172.bb b/meta/recipes-devtools/elfutils/elfutils_0.172.bb index 9d02211d49..1cdff40a86 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.172.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.172.bb @@ -16,6 +16,7 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ file://0006-Fix-build-on-aarch64-musl.patch \ file://0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch \ file://0001-libasm-may-link-with-libbz2-if-found.patch \ + file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ file://debian/0001-hppa_backend.patch \ file://debian/0001-arm_backend.patch \ file://debian/0001-mips_backend.patch \ 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..8b03c0ea6b --- /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,39 @@ +From d68822e93c57c3fbb77b93eada5986d2240157c2 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/msg00065.html] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + libelf/elf_end.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libelf/elf_end.c b/libelf/elf_end.c +index 160f0b8..5388e80 100644 +--- a/libelf/elf_end.c ++++ b/libelf/elf_end.c +@@ -165,9 +165,10 @@ elf_end (Elf *elf) + + /* 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. +-- +2.7.4 + |